ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-31 21:03:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: escape to close topmost window in WindowSystem

Browse source
This commit is contained in:
goat 2021-09-01 00:00:38 +02:00
parent 559b5e2904
commit de27e383b2
No known key found for this signature in database
GPG key ID: F18F057873895461
1 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
using System.Numerics; using System.Numerics;
using Dalamud.Game.ClientState.Keys;
using ImGuiNET; using ImGuiNET;
namespace Dalamud.Interface.Windowing namespace Dalamud.Interface.Windowing
@ -9,6 +10,8 @@ namespace Dalamud.Interface.Windowing
/// </summary> /// </summary>
public abstract class Window public abstract class Window
{ {
private static bool wasEscPressedLastFrame = false;
private bool internalLastIsOpen = false; private bool internalLastIsOpen = false;
private bool internalIsOpen = false; private bool internalIsOpen = false;
@ -169,6 +172,17 @@ namespace Dalamud.Interface.Windowing
{ {
// Draw the actual window contents // Draw the actual window contents
this.Draw(); this.Draw();
var escapeDown = Service<KeyState>.Get()[VirtualKey.ESCAPE];
if (escapeDown && ImGui.IsWindowFocused() && !wasEscPressedLastFrame)
{
this.IsOpen = false;
wasEscPressedLastFrame = true;
}
else if (!escapeDown && wasEscPressedLastFrame)
{
wasEscPressedLastFrame = false;
}
} }
ImGui.End(); ImGui.End();