Merge pull request #4383 from MahApps/jk/feat-4359

Allow to reset the window settings

Author: punker76

src/Directory.packages.props

@@ -15,7 +15,7 @@
     </ItemGroup>
     <ItemGroup Label="Build">
         <PackageVersion Include="JetBrains.Annotations" Version="2022.3.1" />
-        <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.164-beta" />
+        <PackageVersion Include="Microsoft.Windows.CsWin32" Version="0.2.188-beta" />
         <PackageVersion Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
         <PackageVersion Include="MahApps.Metro.IconPacks.Entypo" Version="4.11.0" />
         <PackageVersion Include="MahApps.Metro.IconPacks.FontAwesome" Version="4.11.0" />

src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleWindows/FlyoutDemo.xaml.cs

@@ -1,4 +1,4 @@
-// Licensed to the .NET Foundation under one or more agreements.
+// Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
@@ -29,8 +29,7 @@ public FlyoutDemo()
                     }
                 };
 
-            var mainWindow = (MetroWindow)this;
-            var windowPlacementSettings = mainWindow.GetWindowPlacementSettings();
+            var windowPlacementSettings = this.GetWindowPlacementSettings();
             if (windowPlacementSettings is not null && windowPlacementSettings.UpgradeSettings)
             {
                 windowPlacementSettings.Upgrade();

src/MahApps.Metro/Behaviors/WindowsSettingBehavior.cs

@@ -23,18 +23,6 @@ protected override void OnAttached()
         {
             base.OnAttached();
 
-            this.AssociatedObject.SourceInitialized += this.AssociatedObject_SourceInitialized;
-        }
-
-        /// <inheritdoc />
-        protected override void OnDetaching()
-        {
-            this.CleanUp("from OnDetaching");
-            base.OnDetaching();
-        }
-
-        private void AssociatedObject_SourceInitialized(object? sender, EventArgs e)
-        {
             this.LoadWindowState();
 
             var window = this.AssociatedObject;
@@ -59,6 +47,13 @@ private void AssociatedObject_SourceInitialized(object? sender, EventArgs e)
                 });
         }
 
+        /// <inheritdoc />
+        protected override void OnDetaching()
+        {
+            this.CleanUp("from OnDetaching");
+            base.OnDetaching();
+        }
+
         private void AssociatedObject_Closing(object? sender, System.ComponentModel.CancelEventArgs e)
         {
             this.SaveWindowState();
@@ -99,7 +94,6 @@ private void CleanUp(string fromWhere)
             window.StateChanged -= this.AssociatedObject_StateChanged;
             window.Closing -= this.AssociatedObject_Closing;
             window.Closed -= this.AssociatedObject_Closed;
-            window.SourceInitialized -= this.AssociatedObject_SourceInitialized;
 
             // This operation must be thread safe
             Application.Current?.BeginInvoke(app =>
@@ -169,11 +163,11 @@ private void SaveWindowState()
             var windowHandle = new WindowInteropHelper(window).EnsureHandle();
             var wp = new WINDOWPLACEMENT
                      {
-                        length = (uint)Marshal.SizeOf<WINDOWPLACEMENT>()
+                         length = (uint)Marshal.SizeOf<WINDOWPLACEMENT>()
                      };
             unsafe
             {
-                PInvoke.GetWindowPlacement((HWND)windowHandle, &wp);
+                PInvoke.GetWindowPlacement(new HWND(windowHandle), &wp);
             }
 
             // check for saveable values
@@ -195,7 +189,7 @@ private void SaveWindowState()
                             {
                                 var monitorInfo = new MONITORINFO
                                                   {
-                                                        cbSize = (uint)Marshal.SizeOf<MONITORINFO>()
+                                                      cbSize = (uint)Marshal.SizeOf<MONITORINFO>()
                                                   };
                                 PInvoke.GetMonitorInfo(monitor, &monitorInfo);
                                 rect.Offset(monitorInfo.rcMonitor.left - monitorInfo.rcWork.left, monitorInfo.rcMonitor.top - monitorInfo.rcWork.top);

src/MahApps.Metro/Controls/MetroWindow.cs

@@ -1113,8 +1113,6 @@ public MetroWindow()
         {
             this.SetCurrentValue(MetroDialogOptionsProperty, new MetroDialogSettings());
 
-            this.InitializeSettingsBehavior();
-
             this.DataContextChanged += this.MetroWindow_DataContextChanged;
             this.Loaded += this.MetroWindow_Loaded;
         }
@@ -1129,8 +1127,10 @@ private void MetroWindow_Loaded(object sender, RoutedEventArgs e)
             this.Unloaded += (_, _) => ThemeManager.Current.ThemeChanged -= this.HandleThemeManagerThemeChanged;
         }
 
-        private void InitializeSettingsBehavior()
+        protected override void InitializeBehaviors()
         {
+            base.InitializeBehaviors();
+
             Interaction.GetBehaviors(this).Add(new WindowsSettingBehavior());
         }
 

src/MahApps.Metro/Controls/WinApiHelper.cs

@@ -67,7 +67,7 @@ public static unsafe Size GetMonitorWorkSize(this Visual? visual)
                 {
                     var monitorInfo = new MONITORINFO
                                       {
-                                        cbSize = (uint)Marshal.SizeOf<MONITORINFO>()
+                                          cbSize = (uint)Marshal.SizeOf<MONITORINFO>()
                                       };
                     PInvoke.GetMonitorInfo(monitor, &monitorInfo);
                     return new Size(monitorInfo.rcWork.right - monitorInfo.rcWork.left, monitorInfo.rcWork.bottom - monitorInfo.rcWork.top);
@@ -96,10 +96,17 @@ public static unsafe void SetWindowPlacement(Window? window, WINDOWPLACEMENT? wp
 
             var placement = new WINDOWPLACEMENT
                             {
+                                length = (uint)Marshal.SizeOf<WINDOWPLACEMENT>(),
                                 showCmd = (wp is null || wp.Value.showCmd == SHOW_WINDOW_CMD.SW_SHOWMINIMIZED ? SHOW_WINDOW_CMD.SW_SHOWNORMAL : wp.Value.showCmd),
                                 rcNormalPosition = new RECT { left = x, top = y, right = x + width, bottom = y + height }
                             };
 
+            if (wp is not null)
+            {
+                placement.ptMinPosition = new System.Drawing.Point(wp.Value.ptMinPosition.X, wp.Value.ptMinPosition.Y);
+                placement.ptMaxPosition = new System.Drawing.Point(wp.Value.ptMaxPosition.X, wp.Value.ptMaxPosition.Y);
+            }
+
             var hWnd = new WindowInteropHelper(window).EnsureHandle();
             if (PInvoke.SetWindowPlacement(new HWND(hWnd), &placement) == false)
             {

src/MahApps.Metro/Controls/WindowSettings.cs

@@ -22,23 +22,23 @@ internal WINDOWPLACEMENT ToWINDOWPLACEMENT()
         {
             return new WINDOWPLACEMENT
                    {
-                        length = (uint)Marshal.SizeOf<WINDOWPLACEMENT>(),
-                        showCmd = (SHOW_WINDOW_CMD)this.showCmd,
-                        ptMinPosition = new System.Drawing.Point { X = (int)this.minPosition.X, Y = (int)this.minPosition.Y },
-                        ptMaxPosition = new System.Drawing.Point { X = (int)this.maxPosition.X, Y = (int)this.maxPosition.Y },
-                        rcNormalPosition = new RECT { left = (int)this.normalPosition.X, top = (int)this.normalPosition.Y, right = (int)this.normalPosition.Right, bottom = (int)this.normalPosition.Bottom }
+                       length = (uint)Marshal.SizeOf<WINDOWPLACEMENT>(),
+                       showCmd = (SHOW_WINDOW_CMD)this.showCmd,
+                       ptMinPosition = new System.Drawing.Point { X = (int)this.minPosition.X, Y = (int)this.minPosition.Y },
+                       ptMaxPosition = new System.Drawing.Point { X = (int)this.maxPosition.X, Y = (int)this.maxPosition.Y },
+                       rcNormalPosition = new RECT { left = (int)this.normalPosition.X, top = (int)this.normalPosition.Y, right = (int)this.normalPosition.Right, bottom = (int)this.normalPosition.Bottom }
                    };
         }
 
         internal static WindowPlacementSetting FromWINDOWPLACEMENT(WINDOWPLACEMENT windowplacement)
         {
             return new WindowPlacementSetting
-                    {
-                        showCmd = (uint)windowplacement.showCmd,
-                        minPosition = new Point(windowplacement.ptMinPosition.X, windowplacement.ptMinPosition.Y),
-                        maxPosition = new Point(windowplacement.ptMaxPosition.X, windowplacement.ptMaxPosition.Y),
-                        normalPosition = new Rect(windowplacement.rcNormalPosition.left, windowplacement.rcNormalPosition.top, windowplacement.rcNormalPosition.GetWidth(), windowplacement.rcNormalPosition.GetHeight()),
-                    };
+                   {
+                       showCmd = (uint)windowplacement.showCmd,
+                       minPosition = new Point(windowplacement.ptMinPosition.X, windowplacement.ptMinPosition.Y),
+                       maxPosition = new Point(windowplacement.ptMaxPosition.X, windowplacement.ptMaxPosition.Y),
+                       normalPosition = new Rect(windowplacement.rcNormalPosition.left, windowplacement.rcNormalPosition.top, windowplacement.rcNormalPosition.GetWidth(), windowplacement.rcNormalPosition.GetHeight()),
+                   };
         }
     }
 
@@ -65,6 +65,12 @@ public interface IWindowPlacementSettings
         /// Stores the current values of the settings properties.
         /// </summary>
         void Save();
+
+        /// <summary>
+        /// Calls Reset on the providers.
+        /// Providers must implement IApplicationSettingsProvider to support this.
+        /// </summary>
+        void Reset();
     }
 
     /// <summary>