Mark preset dirty when disabling clickthrough for a window

Use game window to calculate offsets in fallback mouse position code
2025-12-11 01:37:24 +01:00 · 2025-12-10 18:33:37 +01:00 · 2025-12-10 18:13:52 +01:00
2 changed files with 8 additions and 3 deletions
--- a/Dalamud/Interface/ImGuiBackend/InputHandler/Win32InputHandler.cs
+++ b/Dalamud/Interface/ImGuiBackend/InputHandler/Win32InputHandler.cs
@ -494,7 +494,12 @@ internal sealed unsafe partial class Win32InputHandler : IImGuiInputHandler
            // (This is the position you can get with ::GetCursorPos() or WM_MOUSEMOVE + ::ClientToScreen(). In theory adding viewport->Pos to a client position would also be the same.)
            var mousePos = mouseScreenPos;
            if ((io.ConfigFlags & ImGuiConfigFlags.ViewportsEnable) == 0)
-                ClientToScreen(focusedWindow, &mousePos);
+            {
+                // Use game window, otherwise, positions are calculated based on the focused window which might not be the game.
+                // Leads to offsets.
+                ClientToScreen(this.hWnd, &mousePos);
+            }
+
            io.AddMousePosEvent(mousePos.x, mousePos.y);
        }

--- a/Dalamud/Interface/Windowing/Window.cs
+++ b/Dalamud/Interface/Windowing/Window.cs
@ -84,7 +84,7 @@ public abstract class Window
            Click = _ =>
            {
                this.internalIsClickthrough = false;
-                this.presetDirty = false;
+                this.presetDirty = true;
                ImGui.OpenPopup(AdditionsPopupName);
            },
            Priority = int.MinValue,
@ -905,7 +905,7 @@ public abstract class Window
    private void DrawErrorMessage()
    {
        // TODO: Once window systems are services, offer to reload the plugin
-        ImGui.TextColoredWrapped(ImGuiColors.DalamudRed,Loc.Localize("WindowSystemErrorOccurred", "An error occurred while rendering this window. Please contact the developer for details."));
+        ImGui.TextColoredWrapped(ImGuiColors.DalamudRed, Loc.Localize("WindowSystemErrorOccurred", "An error occurred while rendering this window. Please contact the developer for details."));

        ImGuiHelpers.ScaledDummy(5);
Author	SHA1	Message	Date
goaaats	a39763f161	Mark preset dirty when disabling clickthrough for a window Some checks failed Build Dalamud / Build on Windows (push) Waiting to run Details Build Dalamud / Check API Compatibility (push) Blocked by required conditions Details Build Dalamud / Deploy dalamud-distrib staging (push) Blocked by required conditions Details Rollup changes to next version / check (api14) (push) Failing after 3s Details Tag Build / Tag Build (push) Successful in 2s Details	2025-12-10 18:33:37 +01:00
goaaats	201c9cfcf2	Use game window to calculate offsets in fallback mouse position code	2025-12-10 18:13:52 +01:00