chfei/HandyControl
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed .net 4.0 compile problem

Browse Source
This commit is contained in:
NaBian committed 2021-05-30 17:46:41 +08:00
1 parent 95694e7e27
commit 01c41422f8
3 files changed
+18 -11
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Shared/HandyControl_Shared/Themes/Theme.cs
+12 -10
View File
@@ -5,6 +5,7 @@ using System.Windows.Media;
using HandyControl.Data;
using HandyControl.Tools;
using HandyControl.Tools.Helper;
using HandyControl.Tools.Interop;
using Microsoft.Win32;
namespace HandyControl.Themes
@@ -191,25 +192,26 @@ namespace HandyControl.Themes
{
if (AccentColor != null)
{
_precSkin[ResourceToken.PrimaryColor] = AccentColor;
_precSkin[ResourceToken.DarkPrimaryColor] = AccentColor;
_precSkin[ResourceToken.TitleColor] = AccentColor;
_precSkin[ResourceToken.SecondaryTitleColor] = AccentColor;
UpdateAccentColor(AccentColor.Value);
}
}
else
{
var windowGlassColor = ((SolidColorBrush) SystemParameters.WindowGlassBrush).Color;
_precSkin[ResourceToken.PrimaryColor] = windowGlassColor;
_precSkin[ResourceToken.DarkPrimaryColor] = windowGlassColor;
_precSkin[ResourceToken.TitleColor] = windowGlassColor;
_precSkin[ResourceToken.SecondaryTitleColor] = windowGlassColor;
InteropMethods.DwmGetColorizationColor(out var color, out _);
UpdateAccentColor(ColorHelper.ToColor(color));
}
return _precSkin;
}
private void UpdateAccentColor(Color color)
{
_precSkin[ResourceToken.PrimaryColor] = color;
_precSkin[ResourceToken.DarkPrimaryColor] = color;
_precSkin[ResourceToken.TitleColor] = color;
_precSkin[ResourceToken.SecondaryTitleColor] = color;
}
private void UpdateSkin() => MergedDictionaries[0] = GetSkin(Skin);
public virtual ResourceDictionary GetTheme() => ResourceHelper.GetTheme();