Merge branch 'develop'

ControlzEx · Jul 2, 2020 · 31b0b50 · 31b0b50
2 parents 84aac3f + 21ba7cc
commit 31b0b50
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/ControlzEx/Theming/ThemeManager.cs b/src/ControlzEx/Theming/ThemeManager.cs
@@ -1300,9 +1300,8 @@ public void SyncThemeColorSchemeWithWindowsAccentColor(ThemeSyncMode? syncMode,
                 baseColor ??= detectedTheme?.BaseColorScheme ?? BaseColorLight;
             }
 
-            var isHighContrast = detectedTheme?.IsHighContrast == true ||
-                                 (syncModeToUse.HasFlag(ThemeSyncMode.SyncWithHighContrast)
-                                    && WindowsThemeHelper.IsHighContrastEnabled());
+            var isHighContrast = syncModeToUse.HasFlag(ThemeSyncMode.SyncWithHighContrast)
+                                 && WindowsThemeHelper.IsHighContrastEnabled();
 
             var accentColorAsString = accentColor.ToString();
 
@@ -1336,10 +1335,12 @@ public ThemeSyncMode ThemeSyncMode
                 // Always remove handler first.
                 // That way we prevent double registrations.
                 SystemEvents.UserPreferenceChanged -= this.HandleUserPreferenceChanged;
+                SystemParameters.StaticPropertyChanged -= this.HandleStaticPropertyChanged;
 
                 if (this.themeSyncMode != ThemeSyncMode.DoNotSync)
                 {
                     SystemEvents.UserPreferenceChanged += this.HandleUserPreferenceChanged;
+                    SystemParameters.StaticPropertyChanged += this.HandleStaticPropertyChanged;
                 }
             }
         }
@@ -1355,6 +1356,17 @@ private void HandleUserPreferenceChanged(object sender, UserPreferenceChangedEve
             }
         }
 
+        private void HandleStaticPropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            if (e.PropertyName == nameof(SystemParameters.HighContrast)
+                && this.isSyncScheduled == false)
+            {
+                this.isSyncScheduled = true;
+
+                Dispatcher.CurrentDispatcher.BeginInvoke(DispatcherPriority.Background, new Action(() => this.SyncTheme(this.ThemeSyncMode)));
+            }
+        }
+
         private bool isSyncScheduled;
 
         #endregion WindowsAppModeSetting