Don't update view if settings were not changed (#10407)

microsoft · Mar 24, 2021 · aba97a4 · aba97a4
1 parent 3601492
commit aba97a4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 13 deletions.
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/BasePTModuleSettings.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/BasePTModuleSettings.cs
@@ -23,5 +23,16 @@ public virtual string ToJsonString()
             // By default JsonSerializer will only serialize the properties in the base class. This can be avoided by passing the object type (more details at https://stackoverflow.com/a/62498888)
             return JsonSerializer.Serialize(this, GetType());
         }
+
+        public override int GetHashCode()
+        {
+            return ToJsonString().GetHashCode();
+        }
+
+        public override bool Equals(object obj)
+        {
+            var settings = obj as BasePTModuleSettings;
+            return settings?.ToJsonString() == ToJsonString();
+        }
     }
 }
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/ViewModels/PowerLauncherViewModel.cs
@@ -453,5 +453,10 @@ public bool ShowPluginsLoadingMessage
         {
             get => EnablePowerLauncher && !Plugins.Any();
         }
+
+        public bool IsUpToDate(PowerLauncherSettings settings)
+        {
+            return this.settings.Equals(settings);
+        }
     }
 }
diff --git a/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs b/src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml.cs
@@ -28,24 +28,24 @@ public PowerLauncherPage()
             DataContext = ViewModel;
             _ = Helper.GetFileWatcher(PowerLauncherSettings.ModuleName, "settings.json", () =>
             {
-                _ = Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
+                PowerLauncherSettings powerLauncherSettings = null;
+                try
                 {
-                    PowerLauncherSettings powerLauncherSettings = null;
-                    try
-                    {
-                        powerLauncherSettings = settingsUtils.GetSettingsOrDefault<PowerLauncherSettings>(PowerLauncherSettings.ModuleName);
-                    }
-                    catch (IOException ex)
-                    {
-                        Logger.LogInfo(ex.Message);
-                    }
+                    powerLauncherSettings = settingsUtils.GetSettingsOrDefault<PowerLauncherSettings>(PowerLauncherSettings.ModuleName);
+                }
+                catch (IOException ex)
+                {
+                    Logger.LogInfo(ex.Message);
+                }
 
-                    if (powerLauncherSettings != null)
+                if (powerLauncherSettings != null && !ViewModel.IsUpToDate(powerLauncherSettings))
+                {
+                    _ = Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, () =>
                     {
                         DataContext = ViewModel = new PowerLauncherViewModel(powerLauncherSettings, SettingsRepository<GeneralSettings>.GetInstance(settingsUtils), ShellPage.SendDefaultIPCMessage, App.IsDarkTheme);
                         this.Bindings.Update();
-                    }
-                });
+                    });
+                }
             });
 
             var loader = Windows.ApplicationModel.Resources.ResourceLoader.GetForCurrentView();