Small bugfix in Accent Color determination making sure we end up with…

… an accent color even on Windows 7.
olivier-spinelli · Mar 10, 2018 · 57b7ead · 57b7ead
1 parent eaec059
commit 57b7ead
Showing 1 changed file with 24 additions and 2 deletions.
diff --git a/source/Apps/ExplorerTestMLib/ViewModels/ThemeViewModel.cs b/source/Apps/ExplorerTestMLib/ViewModels/ThemeViewModel.cs
@@ -151,12 +151,34 @@ public void ApplyTheme(FrameworkElement fe, string themeName)
             }
         }
 
+        /// <summary>
+        /// Gets the current accent color based on user preference (if any) or
+        /// based on Windows 10 settings (if we run on Windows 10), otherwise
+        /// Accent Color defaults to default blue'ish.
+        /// </summary>
+        /// <param name="settings"></param>
+        /// <returns></returns>
         public static Color GetCurrentAccentColor(ISettingsManager settings)
         {
-            Color AccentColor;
+            Color AccentColor = default(Color);
 
             if (settings.Options.GetOptionValue<bool>("Appearance", "ApplyWindowsDefaultAccent"))
-                AccentColor = SystemParameters.WindowGlassColor;
+            {
+                try
+                {
+                    AccentColor = SystemParameters.WindowGlassColor;
+                }
+                catch
+                {
+                }
+
+                // This may be black on Windows 7 and the experience is black & white then :-(
+                if (AccentColor == default(Color) || AccentColor == Colors.Black || AccentColor.A == 0)
+                {
+                    // default blue accent color
+                    AccentColor = Color.FromRgb(0x1b, 0xa1, 0xe2);
+                }
+            }
             else
                 AccentColor = settings.Options.GetOptionValue<Color>("Appearance", "AccentColor");