Skip to content

Replace accent color resources to use SystemColors.AccentColor #9404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Jul 17, 2024
Merged

Replace accent color resources to use SystemColors.AccentColor #9404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
40499a8
Implemented SystemColors.AccentColor API
dipeshmsft Jul 15, 2024
2e47a67
Replaced accent color usage in Fluent resources with SystemColor.Acce…
dipeshmsft Jul 15, 2024
4fce466
Removed usage of DWMColoization
dipeshmsft Jul 15, 2024
01a2d01
Added accent colors and brushes in HC.xaml
dipeshmsft Jul 17, 2024
b8de642
Merge branch 'main' into fluent/use-systemcolor-accentcolor-fluent
dipeshmsft Jul 17, 2024
db44277
Removed extra files
dipeshmsft Jul 17, 2024
d405813
Merging main branch into fluent/use-systemcolor-accentcolor-fluent
dipeshmsft Jul 17, 2024
92d5816
Merge branch 'main' into fluent/use-systemcolor-accentcolor-fluent
dipeshmsft Jul 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/PresentationFramework/PresentationFramework.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1088,7 +1088,6 @@
<Compile Include="System\Windows\Documents\XPSS0ValidatingLoader.cs" />
<Compile Include="System\Windows\Documents\ZoomPercentageConverter.cs" />
<Compile Include="System\Windows\AccentColorHelper.cs" />
<Compile Include="System\Windows\DwmColorization.cs" />
<Compile Include="System\Windows\DynamicResourceExtension.cs" />
<Compile Include="System\Windows\DynamicResourceExtensionConverter.cs" />
<Compile Include="System\Windows\EventSetter.cs" />
Expand Down
173 changes: 0 additions & 173 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/DWMColorization.cs
View file
Open in desktop

This file was deleted.

53 changes: 39 additions & 14 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/ThemeManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ internal static void InitializeFluentTheme()
var themeColorResourceUri = GetFluentWindowThemeColorResourceUri(_currentApplicationTheme, _currentUseLightMode);
Application.Current.Resources.MergedDictionaries.Add(new ResourceDictionary() { Source = themeColorResourceUri });

DwmColorization.UpdateAccentColors();
_isFluentThemeInitialized = true;
}
}
Expand Down Expand Up @@ -78,7 +77,7 @@ internal static void ApplySystemTheme(IEnumerable windows = null, bool forceUpda

string systemTheme = GetSystemTheme();
bool useLightMode = IsSystemThemeLight();
Color systemAccentColor = DwmColorization.GetSystemAccentColor();
Color systemAccentColor = AccentColorHelper.SystemAccentColor;
ApplyTheme(windows , systemTheme, useLightMode, systemAccentColor, forceUpdate);
}

Expand All @@ -101,9 +100,8 @@ private static void ApplyTheme(
if(forceUpdate ||
requestedTheme != _currentApplicationTheme ||
requestedUseLightMode != _currentUseLightMode ||
DwmColorization.GetSystemAccentColor() != DwmColorization.CurrentApplicationAccentColor)
requestedAccentColor != _currentSystemAccentColor)
{
DwmColorization.UpdateAccentColors();

Uri dictionaryUri = GetFluentWindowThemeColorResourceUri(requestedTheme, requestedUseLightMode);
AddOrUpdateThemeResources(dictionaryUri);
Expand All @@ -121,6 +119,7 @@ private static void ApplyTheme(

_currentApplicationTheme = requestedTheme;
_currentUseLightMode = requestedUseLightMode;
_currentSystemAccentColor = requestedAccentColor;
}
}

Expand Down Expand Up @@ -192,18 +191,14 @@ private static void AddOrUpdateThemeResources(Uri dictionaryUri)

var newDictionary = new ResourceDictionary() { Source = dictionaryUri };

ResourceDictionary currentDictionary = Application.Current?.Resources;
foreach (var key in newDictionary.Keys)
FindFluentThemeAndColorDictionary(out ResourceDictionary fluentDictionary, out ResourceDictionary colorDictionary);

if (colorDictionary != null)
{
if (currentDictionary.Contains(key))
{
currentDictionary[key] = newDictionary[key];
}
else
{
currentDictionary.Add(key, newDictionary[key]);
}
Application.Current.Resources.MergedDictionaries.Remove(colorDictionary);
}

Application.Current.Resources.MergedDictionaries.Add(newDictionary);
}

#endregion
Expand Down Expand Up @@ -232,6 +227,31 @@ private static Uri GetFluentWindowThemeColorResourceUri(string systemTheme, bool
return new Uri("pack://application:,,,/PresentationFramework.Fluent;component/Resources/Theme/" + themeColorFileName, UriKind.Absolute);
}

private static void FindFluentThemeAndColorDictionary(out ResourceDictionary fluentThemeDictionary, out ResourceDictionary fluentColorDictionary)
{
fluentThemeDictionary = null;
fluentColorDictionary = null;

if (Application.Current == null) return;

foreach (ResourceDictionary mergedDictionary in Application.Current.Resources.MergedDictionaries)
{
if (mergedDictionary.Source != null)
{
if (mergedDictionary.Source.ToString() == fluentResourceDictionaryUri)
{
fluentThemeDictionary = mergedDictionary;
}
else if (mergedDictionary.Source.ToString().StartsWith(fluentColorResourceUriPart))
{
fluentColorDictionary = mergedDictionary;
}
}
}
}



#endregion

#region Private Members
Expand All @@ -240,6 +260,9 @@ private static Uri GetFluentWindowThemeColorResourceUri(string systemTheme, bool

private static readonly string _regPersonalizeKeyPath = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";

private static readonly string fluentResourceDictionaryUri = "pack://application:,,,/PresentationFramework.Fluent;component/Resources/Fluent.xaml";
private static readonly string fluentColorResourceUriPart = "pack://application:,,,/PresentationFramework.Fluent;component/Resources/Theme/";

private static string _currentApplicationTheme;

private static bool _currentUseLightMode = true;
Expand All @@ -248,5 +271,7 @@ private static Uri GetFluentWindowThemeColorResourceUri(string systemTheme, bool

private static bool _isFluentThemeInitialized = false;

private static Color _currentSystemAccentColor = AccentColorHelper.SystemAccentColor;

#endregion
}
47 changes: 0 additions & 47 deletions src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Accent.xaml
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/Microsoft.DotNet.Wpf/src/Themes/PresentationFramework.Fluent/Resources/Fluent.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
-->
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Resources/Accent.xaml" />
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Resources/DefaultContextMenu.xaml" />
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Resources/DefaultFocusVisualStyle.xaml" />
<ResourceDictionary Source="pack://application:,,,/PresentationFramework.Fluent;component/Resources/Fonts.xaml" />
Expand Down
Loading