[FancyZones] Convert ARGB color values to RGB (#6277)

microsoft · Sep 2, 2020 · c9cb4a7 · c9cb4a7
1 parent 0292ece
commit c9cb4a7
Showing 1 changed file with 18 additions and 0 deletions.
diff --git a/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/FancyZonesViewModel.cs b/src/core/Microsoft.PowerToys.Settings.UI.Lib/ViewModels/FancyZonesViewModel.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
+using System.Drawing;
 using System.Runtime.CompilerServices;
 using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
 using Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands;
@@ -401,6 +402,7 @@ public string ZoneHighlightColor
 
             set
             {
+                value = ToRGBHex(value);
                 if (!value.Equals(_zoneHighlightColor))
                 {
                     _zoneHighlightColor = value;
@@ -419,6 +421,7 @@ public string ZoneBorderColor
 
             set
             {
+                value = ToRGBHex(value);
                 if (!value.Equals(_zoneBorderColor, StringComparison.OrdinalIgnoreCase))
                 {
                     _zoneBorderColor = value;
@@ -437,6 +440,7 @@ public string ZoneInActiveColor
 
             set
             {
+                value = ToRGBHex(value);
                 if (!value.Equals(_zoneInActiveColor))
                 {
                     _zoneInActiveColor = value;
@@ -524,5 +528,19 @@ public void RaisePropertyChanged([CallerMemberName] string propertyName = null)
                 SendConfigMSG(ipcMessage.ToJsonString());
             }
         }
+
+        private string ToRGBHex(string color)
+        {
+            try
+            {
+                int argb = int.Parse(color.Replace("#", string.Empty), System.Globalization.NumberStyles.HexNumber);
+                Color clr = Color.FromArgb(argb);
+                return "#" + clr.R.ToString("X2") + clr.G.ToString("X2") + clr.B.ToString("X2");
+            }
+            catch (Exception)
+            {
+                return "#FFFFFF";
+            }
+        }
     }
 }