ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-19 06:17:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix window focus for minimized windows

Browse source
This commit is contained in:
Raymond 2021-10-17 19:05:44 -04:00
parent b763dd5368
commit 22810a1093
2 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Dalamud/Interface/Windowing/Window.cs
View file

@ -197,20 +197,20 @@ namespace Dalamud.Interface.Windowing
{ {
// Draw the actual window contents // Draw the actual window contents
this.Draw(); this.Draw();
}
this.IsFocused = ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows); this.IsFocused = ImGui.IsWindowFocused(ImGuiFocusedFlags.RootAndChildWindows);
var escapeDown = Service<KeyState>.Get()[VirtualKey.ESCAPE]; var escapeDown = Service<KeyState>.Get()[VirtualKey.ESCAPE];
var isAllowed = Service<DalamudConfiguration>.Get().IsFocusManagementEnabled; var isAllowed = Service<DalamudConfiguration>.Get().IsFocusManagementEnabled;
if (escapeDown && this.IsFocused && isAllowed && !wasEscPressedLastFrame && this.RespectCloseHotkey) if (escapeDown && this.IsFocused && isAllowed && !wasEscPressedLastFrame && this.RespectCloseHotkey)
{ {
this.IsOpen = false; this.IsOpen = false;
wasEscPressedLastFrame = true; wasEscPressedLastFrame = true;
} }
else if (!escapeDown && wasEscPressedLastFrame) else if (!escapeDown && wasEscPressedLastFrame)
{ {
wasEscPressedLastFrame = false; wasEscPressedLastFrame = false;
}
} }
ImGui.End(); ImGui.End();

2
Dalamud/Interface/Windowing/WindowSystem.cs
View file

@ -107,7 +107,7 @@ namespace Dalamud.Interface.Windowing
ImGuiManagedAsserts.ReportProblems(source, snapshot); ImGuiManagedAsserts.ReportProblems(source, snapshot);
} }
var focusedWindow = this.windows.FirstOrDefault(x => x.IsFocused && x.RespectCloseHotkey); var focusedWindow = this.windows.FirstOrDefault(window => window.IsFocused && window.RespectCloseHotkey);
this.HasAnyFocus = focusedWindow != default; this.HasAnyFocus = focusedWindow != default;
if (this.HasAnyFocus) if (this.HasAnyFocus)