Shift to ControlzEx HC code (#6880)

* Use high contrast detection from controlzex * Allow multiple theme changes
microsoft · Oct 1, 2020 · 55fd874 · 55fd874
1 parent fd32a6f
commit 55fd874
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/src/modules/launcher/Wox.Plugin/ThemeManager.cs b/src/modules/launcher/Wox.Plugin/ThemeManager.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Diagnostics;
 using System.Linq;
 using System.Windows;
 using ControlzEx.Theming;
@@ -63,17 +64,8 @@ public ThemeManager(Application app)
                     MahAppsLibraryThemeProvider.DefaultInstance));
 
             ResetTheme();
-            ControlzEx.Theming.ThemeManager.Current.ThemeSyncMode = ThemeSyncMode.SyncWithAppMode;
+            ControlzEx.Theming.ThemeManager.Current.ThemeSyncMode = ThemeSyncMode.SyncAll;
             ControlzEx.Theming.ThemeManager.Current.ThemeChanged += Current_ThemeChanged;
-            SystemParameters.StaticPropertyChanged += SystemParameters_StaticPropertyChanged;
-        }
-
-        private void SystemParameters_StaticPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName == nameof(SystemParameters.HighContrast))
-            {
-                ResetTheme();
-            }
         }
 
         public Theme GetCurrentTheme()
@@ -104,7 +96,7 @@ private static Theme GetHighContrastBaseType()
 
         private void ResetTheme()
         {
-            if (SystemParameters.HighContrast)
+            if (WindowsThemeHelper.IsHighContrastEnabled())
             {
                 Theme highContrastBaseType = GetHighContrastBaseType();
                 ChangeTheme(highContrastBaseType);
@@ -119,10 +111,6 @@ private void ResetTheme()
         private void ChangeTheme(Theme theme)
         {
             Theme oldTheme = currentTheme;
-            if (theme == currentTheme)
-            {
-                return;
-            }
 
             if (theme == Theme.HighContrastOne)
             {
@@ -174,7 +162,6 @@ protected virtual void Dispose(bool disposing)
                 if (disposing)
                 {
                     ControlzEx.Theming.ThemeManager.Current.ThemeChanged -= Current_ThemeChanged;
-                    SystemParameters.StaticPropertyChanged -= SystemParameters_StaticPropertyChanged;
                     _disposed = true;
                 }
             }