Merge branch 'hotfix/2.4.7' into main

punker76 · punker76 · commit ee63390e64f4 · 2021-07-01T13:22:16.000+02:00
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;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -185,6 +185,13 @@ private void SaveWindowState()`
`185`	`185`	`RECT rect;`
`186`	`186`	`if (UnsafeNativeMethods.GetWindowRect(hwnd, out rect))`
`187`	`187`	`{`
	`188`	`+ var monitor = NativeMethods.MonitorFromWindow(hwnd, MonitorOptions.MONITOR_DEFAULTTONEAREST);`
	`189`	`+ if (monitor != IntPtr.Zero)`
	`190`	`+ {`
	`191`	`+ var monitorInfo = NativeMethods.GetMonitorInfo(monitor);`
	`192`	`+ rect.Offset(monitorInfo.rcMonitor.Left - monitorInfo.rcWork.Left, monitorInfo.rcMonitor.Top - monitorInfo.rcWork.Top);`
	`193`	`+ }`
	`194`	`+`
`188`	`195`	`wp.normalPosition = rect;`
`189`	`196`	`}`
`190`	`197`	`}`