mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-16 19:57:57 +01:00
[FancyZones] Convert ARGB color values to RGB (#6277)
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
// See the LICENSE file in the project root for more information.
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
|
using System.Drawing;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
|
using Microsoft.PowerToys.Settings.UI.Lib.Helpers;
|
||||||
using Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands;
|
using Microsoft.PowerToys.Settings.UI.Lib.ViewModels.Commands;
|
||||||
@@ -401,6 +402,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
|
|||||||
|
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
|
value = ToRGBHex(value);
|
||||||
if (!value.Equals(_zoneHighlightColor))
|
if (!value.Equals(_zoneHighlightColor))
|
||||||
{
|
{
|
||||||
_zoneHighlightColor = value;
|
_zoneHighlightColor = value;
|
||||||
@@ -419,6 +421,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
|
|||||||
|
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
|
value = ToRGBHex(value);
|
||||||
if (!value.Equals(_zoneBorderColor, StringComparison.OrdinalIgnoreCase))
|
if (!value.Equals(_zoneBorderColor, StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
_zoneBorderColor = value;
|
_zoneBorderColor = value;
|
||||||
@@ -437,6 +440,7 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
|
|||||||
|
|
||||||
set
|
set
|
||||||
{
|
{
|
||||||
|
value = ToRGBHex(value);
|
||||||
if (!value.Equals(_zoneInActiveColor))
|
if (!value.Equals(_zoneInActiveColor))
|
||||||
{
|
{
|
||||||
_zoneInActiveColor = value;
|
_zoneInActiveColor = value;
|
||||||
@@ -524,5 +528,19 @@ namespace Microsoft.PowerToys.Settings.UI.Lib.ViewModels
|
|||||||
SendConfigMSG(ipcMessage.ToJsonString());
|
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";
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user