Fixed an issue where changing a setting wouldn't save the setting correctly the first time the value was changed (#2649)

yaira2 · web-flow · commit c122bd31482d · 2020-12-20T17:49:13.000-05:00
diff --git a/Files/Dialogs/PropertiesDialog.xaml b/Files/Dialogs/PropertiesDialog.xaml
@@ -12,7 +12,7 @@
     <ContentDialog.Background>
         <AcrylicBrush
             Windows10version1903:TintLuminosityOpacity="0.9"
-            AlwaysUseFallback="{x:Bind AppSettings.AcrylicEnabled, Mode=OneWay}"
+            AlwaysUseFallback="{x:Bind AppSettings.IsAcrylicDisabled, Mode=OneWay}"
             BackgroundSource="HostBackdrop"
             FallbackColor="{x:Bind AppSettings.AcrylicTheme.FallbackColor, Mode=OneWay}"
             TintColor="{x:Bind AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
diff --git a/Files/Enums/SidebarOpacity.cs b/Files/Enums/SidebarOpacity.cs
@@ -3,6 +3,6 @@
     public enum SidebarOpacity
     {
         Opaque = 0,
-        AcrylicEnabled = 1
+        IsAcrylicDisabled = 1
     }
 }
diff --git a/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml b/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml
@@ -771,7 +771,7 @@
                             <AcrylicBrush
                                 x:Key="TabViewBackground"
                                 Windows10version1903:TintLuminosityOpacity="0.75"
-                                AlwaysUseFallback="{x:Bind AppSettings.AcrylicEnabled, Mode=OneWay}"
+                                AlwaysUseFallback="{x:Bind AppSettings.IsAcrylicDisabled, Mode=OneWay}"
                                 BackgroundSource="HostBackdrop"
                                 FallbackColor="#FFF3F2F1"
                                 TintColor="{x:Bind AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
@@ -781,7 +781,7 @@
                             <AcrylicBrush
                                 x:Key="TabViewBackground"
                                 Windows10version1903:TintLuminosityOpacity="0.75"
-                                AlwaysUseFallback="{x:Bind AppSettings.AcrylicEnabled, Mode=OneWay}"
+                                AlwaysUseFallback="{x:Bind AppSettings.IsAcrylicDisabled, Mode=OneWay}"
                                 BackgroundSource="HostBackdrop"
                                 FallbackColor="#161514"
                                 TintColor="{x:Bind AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
diff --git a/Files/UserControls/SidebarControl.xaml b/Files/UserControls/SidebarControl.xaml
@@ -20,7 +20,7 @@
                     <AcrylicBrush
                         x:Key="NavigationViewExpandedPaneBackground"
                         Windows10version1903:TintLuminosityOpacity="0.9"
-                        AlwaysUseFallback="{x:Bind AppSettings.AcrylicEnabled, Mode=OneWay}"
+                        AlwaysUseFallback="{x:Bind AppSettings.IsAcrylicDisabled, Mode=OneWay}"
                         BackgroundSource="HostBackdrop"
                         FallbackColor="{x:Bind AppSettings.AcrylicTheme.FallbackColor, Mode=OneWay}"
                         TintColor="{x:Bind AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
@@ -30,7 +30,7 @@
                     <AcrylicBrush
                         x:Key="NavigationViewExpandedPaneBackground"
                         Windows10version1903:TintLuminosityOpacity="0.9"
-                        AlwaysUseFallback="{x:Bind AppSettings.AcrylicEnabled, Mode=OneWay}"
+                        AlwaysUseFallback="{x:Bind AppSettings.IsAcrylicDisabled, Mode=OneWay}"
                         BackgroundSource="HostBackdrop"
                         FallbackColor="{x:Bind AppSettings.AcrylicTheme.FallbackColor, Mode=OneWay}"
                         TintColor="{x:Bind AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
diff --git a/Files/View Models/SettingsViewModel.cs b/Files/View Models/SettingsViewModel.cs
@@ -41,7 +41,6 @@ public SettingsViewModel()
         {
             _roamingSettings = ApplicationData.Current.RoamingSettings;
 
-            DetectAcrylicPreference();
             DetectDateTimeFormat();
             PinSidebarLocationItems();
             DetectRecycleBinPreference();
@@ -58,7 +57,7 @@ public SettingsViewModel()
             Analytics.TrackEvent("PinRecycleBinToSideBar " + PinRecycleBinToSideBar.ToString());
             Analytics.TrackEvent("ShowFileExtensions " + ShowFileExtensions.ToString());
             Analytics.TrackEvent("ShowConfirmDeleteDialog " + ShowConfirmDeleteDialog.ToString());
-            Analytics.TrackEvent("AcrylicSidebar " + AcrylicEnabled.ToString());
+            Analytics.TrackEvent("IsAcrylicDisabled " + IsAcrylicDisabled.ToString());
             Analytics.TrackEvent("ShowFileOwner " + ShowFileOwner.ToString());
             Analytics.TrackEvent("IsHorizontalTabStripEnabled " + IsHorizontalTabStripEnabled.ToString());
             Analytics.TrackEvent("IsVerticalTabFlyoutEnabled " + IsVerticalTabFlyoutEnabled.ToString());
@@ -510,28 +509,10 @@ public bool ListAndSortDirectoriesAlongsideFiles
             set => Set(value);
         }
 
-        private void DetectAcrylicPreference()
+        public bool IsAcrylicDisabled
         {
-            if (localSettings.Values["AcrylicEnabled"] == null)
-            {
-                localSettings.Values["AcrylicEnabled"] = true;
-            }
-            AcrylicEnabled = (bool)localSettings.Values["AcrylicEnabled"];
-        }
-
-        private bool _AcrylicEnabled = true;
-
-        public bool AcrylicEnabled
-        {
-            get => _AcrylicEnabled;
-            set
-            {
-                if (value != _AcrylicEnabled)
-                {
-                    SetProperty(ref _AcrylicEnabled, value);
-                    localSettings.Values["AcrylicEnabled"] = value;
-                }
-            }
+            get => Get(true);
+            set => Set(value);
         }
 
         public bool ShowAllContextMenuItems
@@ -772,10 +753,11 @@ public TValue Get<TValue>(TValue defaultValue, [CallerMemberName] string propert
                     Set(tValue, propertyName); // Put the corrected value in settings.
                     return tValue;
                 }
-
                 return tValue;
             }
 
+            _roamingSettings.Values[propertyName] = defaultValue;
+
             return defaultValue;
         }
 
diff --git a/Files/Views/Pages/Properties.xaml.cs b/Files/Views/Pages/Properties.xaml.cs
@@ -75,7 +75,7 @@ private void AppSettings_PropertyChanged(object sender, System.ComponentModel.Pr
         {
             switch (e.PropertyName)
             {
-                case "AcrylicEnabled":
+                case "IsAcrylicDisabled":
                 case "FallbackColor":
                 case "TintColor":
                 case "TintOpacity":
@@ -90,7 +90,7 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             {
                 var backgroundBrush = new AcrylicBrush()
                 {
-                    AlwaysUseFallback = AppSettings.AcrylicEnabled,
+                    AlwaysUseFallback = AppSettings.IsAcrylicDisabled,
                     BackgroundSource = AcrylicBackgroundSource.HostBackdrop,
                     FallbackColor = AppSettings.AcrylicTheme.FallbackColor,
                     TintColor = AppSettings.AcrylicTheme.TintColor,
diff --git a/Files/Views/Settings.xaml b/Files/Views/Settings.xaml
@@ -17,7 +17,7 @@
                     <AcrylicBrush
                         x:Key="NavigationViewExpandedPaneBackground"
                         Windows10version1903:TintLuminosityOpacity="0.9"
-                        AlwaysUseFallback="{x:Bind AppSettings.AcrylicEnabled, Mode=OneWay}"
+                        AlwaysUseFallback="{x:Bind AppSettings.IsAcrylicDisabled, Mode=OneWay}"
                         BackgroundSource="HostBackdrop"
                         FallbackColor="{x:Bind AppSettings.AcrylicTheme.FallbackColor, Mode=OneWay}"
                         TintColor="{x:Bind AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
@@ -27,7 +27,7 @@
                     <AcrylicBrush
                         x:Key="NavigationViewExpandedPaneBackground"
                         Windows10version1903:TintLuminosityOpacity="0.9"
-                        AlwaysUseFallback="{x:Bind AppSettings.AcrylicEnabled, Mode=OneWay}"
+                        AlwaysUseFallback="{x:Bind AppSettings.IsAcrylicDisabled, Mode=OneWay}"
                         BackgroundSource="HostBackdrop"
                         FallbackColor="{x:Bind AppSettings.AcrylicTheme.FallbackColor, Mode=OneWay}"
                         TintColor="{x:Bind AppSettings.AcrylicTheme.TintColor, Mode=OneWay}"
diff --git a/Files/Views/SettingsPages/Appearance.xaml b/Files/Views/SettingsPages/Appearance.xaml
@@ -68,7 +68,7 @@
                     x:Uid="SettingsAppearanceAcrylicSidebar"
                     Header="Acrylic sidebar"
                     HeaderTemplate="{StaticResource CustomHeaderStyle}"
-                    IsOn="{x:Bind AppSettings.AcrylicEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolNegationConverter}}" />
+                    IsOn="{x:Bind AppSettings.IsAcrylicDisabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, Converter={StaticResource BoolNegationConverter}}" />
             </StackPanel>
         </ScrollViewer>
     </Grid>

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`public enum SidebarOpacity`
`4`	`4`	`{`
`5`	`5`	`Opaque = 0,`
`6`		`- AcrylicEnabled = 1`
	`6`	`+ IsAcrylicDisabled = 1`
`7`	`7`	`}`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ private void AppSettings_PropertyChanged(object sender, System.ComponentModel.Pr`
`75`	`75`	`{`
`76`	`76`	`switch (e.PropertyName)`
`77`	`77`	`{`
`78`		`- case "AcrylicEnabled":`
	`78`	`+ case "IsAcrylicDisabled":`
`79`	`79`	`case "FallbackColor":`
`80`	`80`	`case "TintColor":`
`81`	`81`	`case "TintOpacity":`
`@@ -90,7 +90,7 @@ await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>`
`90`	`90`	`{`
`91`	`91`	`var backgroundBrush = new AcrylicBrush()`
`92`	`92`	`{`
`93`		`- AlwaysUseFallback = AppSettings.AcrylicEnabled,`
	`93`	`+ AlwaysUseFallback = AppSettings.IsAcrylicDisabled,`
`94`	`94`	`BackgroundSource = AcrylicBackgroundSource.HostBackdrop,`
`95`	`95`	`FallbackColor = AppSettings.AcrylicTheme.FallbackColor,`
`96`	`96`	`TintColor = AppSettings.AcrylicTheme.TintColor,`