UpgradeSettings should be true per default (DefaultValue works only f…

…or Designer)
MahApps · Feb 25, 2015 · 509bd77 · 509bd77
1 parent df66c96
commit 509bd77
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/MahApps.Metro/Controls/WindowSettings.cs b/MahApps.Metro/Controls/WindowSettings.cs
@@ -21,7 +21,6 @@ public interface IWindowPlacementSettings
         /// <summary>
         /// Upgrades the application settings on loading.
         /// </summary>
-        [DefaultValue(true)]
         bool UpgradeSettings { get; set; }
 
         /// <summary>
@@ -57,11 +56,16 @@ public WINDOWPLACEMENT? Placement {
             }
         }
 
+        private bool upgradeSettings = true;
+
         /// <summary>
         /// Upgrades the application settings on loading.
         /// </summary>
-        [DefaultValue(true)]
-        public bool UpgradeSettings { get; set; }
+        public bool UpgradeSettings
+        {
+            get { return upgradeSettings; }
+            set { upgradeSettings = value; }
+        }
     }
 
     public class WindowSettings

diff --git a/Mahapps.Metro.Tests/MetroWindowTest.cs b/Mahapps.Metro.Tests/MetroWindowTest.cs
@@ -205,5 +205,18 @@ public async Task MinMaxCloseButtonsShouldBeHidden()
             Assert.False(closeButton.IsVisible);
             Assert.Equal(ResizeMode.CanResize, window.ResizeMode);
         }
+
+        [Fact]
+        public async Task WindowSettingsUpgradeSettingsShouldBeTrueByDefault()
+        {
+            await TestHost.SwitchToAppThread();
+
+            var window = await WindowHelpers.CreateInvisibleWindowAsync<MetroWindow>();
+            window.SaveWindowPosition = true;
+
+            var settings = window.GetWindowPlacementSettings();
+            Assert.NotNull(settings);
+            Assert.Equal(true, settings.UpgradeSettings);
+        }
     }
 }