fix: #4449 move saved maximized window before set window position

Closes #4449
MahApps · Feb 20, 2024 · fb2cf67 · fb2cf67
1 parent cd234ae
commit fb2cf67
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/MahApps.Metro/Native/WinApiHelper.cs b/src/MahApps.Metro/Native/WinApiHelper.cs
@@ -110,9 +110,20 @@ public static unsafe void SetWindowPlacement(Window? window, WINDOWPLACEMENT? wp
             }
 
             var hWnd = new WindowInteropHelper(window).EnsureHandle();
+
+            var placementBefore = new WINDOWPLACEMENT { length = (uint)Marshal.SizeOf<WINDOWPLACEMENT>() };
+            PInvoke.GetWindowPlacement((HWND)hWnd, &placementBefore);
+            if (placementBefore.showCmd is SHOW_WINDOW_CMD.SW_NORMAL or SHOW_WINDOW_CMD.SW_SHOWMAXIMIZED && placement.showCmd is SHOW_WINDOW_CMD.SW_SHOWMAXIMIZED)
+            {
+                if (PInvoke.MoveWindow((HWND)hWnd, placement.rcNormalPosition.X, placement.rcNormalPosition.Y, placement.rcNormalPosition.Width, placement.rcNormalPosition.Height, false) == false)
+                {
+                    Trace.TraceWarning($"{window}: The window can not moved! (MoveWindow) {placement}");
+                }
+            }
+
             if (PInvoke.SetWindowPlacement(new HWND(hWnd), &placement) == false)
             {
-                Trace.TraceWarning($"{window}: The window placement {wp} could not be (SetWindowPlacement)!");
+                Trace.TraceWarning($"{window}: The window placement {wp} could not be set (SetWindowPlacement) {placement}!");
             }
         }
 

diff --git a/src/MahApps.Metro/NativeMethods.txt b/src/MahApps.Metro/NativeMethods.txt
@@ -6,6 +6,7 @@ LoadLibrary
 LoadString
 MapVirtualKey
 MonitorFromWindow
+MoveWindow
 ReleaseCapture
 SendMessage
 SetWindowPlacement