From eabd5467f1edd274413987dcd67844bdb2ef96da Mon Sep 17 00:00:00 2001 From: meli <57847713+ff-meli@users.noreply.github.com> Date: Fri, 10 Jan 2020 10:02:25 -0800 Subject: [PATCH] Update cursor behavior. Should resolve fps and flicker issues when vsync is off, but now there will be 2 cursors in the ui, and the game cursor will change based on what is underneath the ui, even though it won't be interactable through the window --- Dalamud/Interface/InterfaceManager.cs | 7 +++++++ lib/ImGuiScene | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/Dalamud/Interface/InterfaceManager.cs b/Dalamud/Interface/InterfaceManager.cs index d035c07cc..c33970dc1 100644 --- a/Dalamud/Interface/InterfaceManager.cs +++ b/Dalamud/Interface/InterfaceManager.cs @@ -106,6 +106,13 @@ namespace Dalamud.Interface private void DrawUI() { + // this is more or less part of what reshade/etc do to avoid having to manually + // set the cursor inside the ui + // This effectively means that when the ui is hovered, there will be 2 cursors - + // the normal one from the game, and the one for ImGui + // Doing this here because it's somewhat application-specific behavior + ImGui.GetIO().MouseDrawCursor = ImGui.GetIO().WantCaptureMouse; + ImGui.ShowDemoWindow(); } } diff --git a/lib/ImGuiScene b/lib/ImGuiScene index 24632d181..4f0528ad8 160000 --- a/lib/ImGuiScene +++ b/lib/ImGuiScene @@ -1 +1 @@ -Subproject commit 24632d181ebb4af0a7793bbdea2dbf3c21fa7b06 +Subproject commit 4f0528ad80bc55d1c47341f1fdaa423c4da6f29c