Merge branch 'hotfix/2.4.7' into main

MahApps · Jul 1, 2021 · ee63390 · ee63390
2 parents 4421322 + c00d8eb
commit ee63390
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs b/src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs
@@ -185,6 +185,13 @@ private void SaveWindowState()
                     RECT rect;
                     if (UnsafeNativeMethods.GetWindowRect(hwnd, out rect))
                     {
+                        var monitor = NativeMethods.MonitorFromWindow(hwnd, MonitorOptions.MONITOR_DEFAULTTONEAREST);
+                        if (monitor != IntPtr.Zero)
+                        {
+                            var monitorInfo = NativeMethods.GetMonitorInfo(monitor);
+                            rect.Offset(monitorInfo.rcMonitor.Left - monitorInfo.rcWork.Left, monitorInfo.rcMonitor.Top - monitorInfo.rcWork.Top);
+                        }
+
                         wp.normalPosition = rect;
                     }
                 }