Skip to content

Use Fluent.xaml for System ThemeMode #6

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

Open
dipeshmsft wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use Fluent.xaml for System ThemeMode #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -936,8 +936,8 @@ public ResourceDictionary Resources
{
if(value != null)
{
var uri = ThemeManager.GetThemeResource(ThemeMode);
value.MergedDictionaries.Insert(0, new ResourceDictionary() { Source = uri });
ResourceDictionary rd = ThemeManager.GetFluentThemeDictionary(ThemeMode);
value.MergedDictionaries.Insert(0, rd);
}
ThemeManager.DeferredAppThemeLoading = false;
}
Expand Down Expand Up @@ -993,6 +993,7 @@ public ThemeMode ThemeMode
// If the resources are not initializd,
// fluent dictionary included will be reset.
// Hence, deferring the step.
ThemeManager.OnApplicationThemeChanged(oldValue, value);
ThemeManager.DeferredAppThemeLoading = true;
return;
}
Expand Down Expand Up @@ -1741,8 +1742,7 @@ internal void InvalidateResourceReferences(ResourcesChangeInfo info)
// i.e. SkipAppThemeModeSyncing is set to true
// - if application's ThemeMode and Resources sync is enabled.
// i.e. IsAppThemeModeSyncEnabled is set to true
if (!ThemeManager.SkipAppThemeModeSyncing
&& ThemeManager.IsAppThemeModeSyncEnabled)
if (!ThemeManager.SkipAppThemeModeSyncing)
{
ThemeManager.SyncThemeMode();
}
Expand Down
111 changes: 38 additions & 73 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 @@ -24,16 +24,15 @@ internal static void OnSystemThemeChanged()
{

bool useLightColors = GetUseLightColors(Application.Current.ThemeMode);
var fluentThemeResourceUri = GetFluentThemeResourceUri(useLightColors);

FluentThemeState newFluentThemeState = new FluentThemeState(Application.Current.ThemeMode.Value, useLightColors);

if (s_currentFluentThemeState == newFluentThemeState)
{
return;
}

AddOrUpdateThemeResources(Application.Current.Resources, fluentThemeResourceUri);
ResourceDictionary rd = GetFluentThemeDictionary(Application.Current.ThemeMode);
AddOrUpdateThemeResources(Application.Current.Resources, rd);

foreach (Window window in Application.Current.Windows)
{
Expand Down Expand Up @@ -91,8 +90,8 @@ internal static void OnApplicationThemeChanged(ThemeMode oldThemeMode, ThemeMode
}

bool useLightColors = GetUseLightColors(newThemeMode);
var fluentThemeResourceUri = GetFluentThemeResourceUri(useLightColors);
AddOrUpdateThemeResources(Application.Current.Resources, fluentThemeResourceUri);
ResourceDictionary rd = GetFluentThemeDictionary(newThemeMode);
AddOrUpdateThemeResources(Application.Current.Resources, rd);

foreach (Window window in Application.Current.Windows)
{
Expand Down Expand Up @@ -129,54 +128,14 @@ internal static bool SyncThemeMode()
{
ThemeMode themeMode = GetThemeModeFromResourceDictionary(Application.Current.Resources);

if (Application.Current.ThemeMode != themeMode)
if (Application.Current.ThemeMode != themeMode || themeMode == ThemeMode.System)
{
Application.Current.ThemeMode = themeMode;
return themeMode == ThemeMode.None ? false : true;
}
return false;
}

internal static void SyncThemeModeAndResources()
{
// Since, this is called from window there is a possiblity that the application
// instance is null. Hence, we need to check for null.
if(Application.Current == null)
return;

ThemeMode themeMode = Application.Current.ThemeMode;
var rd = Application.Current.Resources;

bool resyncThemeMode = false;
int index = LastIndexOfFluentThemeDictionary(rd);

if (index == -1)
{
// This means that ThemeMode was set but Resources were not set during initialization.
// Hence we need to resync.
if (themeMode != ThemeMode.None)
{
resyncThemeMode = true;
}
}
else
{
// If index > 0, then Fluent theme dictionary was added manually.
// If ThemeMode is None, and yet there is a Fluent theme dictionary, hence that was manually set.
// Hence we need to resync.
if (index > 0 || themeMode == ThemeMode.None)
{
themeMode = GetThemeModeFromSourceUri(rd.MergedDictionaries[index].Source);
resyncThemeMode = true;
}
}

if (resyncThemeMode)
{
Application.Current.ThemeMode = themeMode;
}
}

internal static void ApplyStyleOnWindow(Window window)
{
if (!IsFluentThemeEnabled && window.ThemeMode == ThemeMode.None)
Expand Down Expand Up @@ -204,10 +163,36 @@ internal static bool IsValidThemeMode(ThemeMode themeMode)
|| themeMode == ThemeMode.System;
}

internal static Uri GetThemeResource(ThemeMode themeMode)
internal static ResourceDictionary GetFluentThemeDictionary(ThemeMode themeMode)
{
if (themeMode == ThemeMode.None)
{
return null;
}

if ( SystemParameters.HighContrast)
{
return new ResourceDictionary() { Source = new Uri(FluentThemeResourceDictionaryUri + "Fluent.HC.xaml", UriKind.Absolute) };
}

ResourceDictionary rd = null;
bool useLightColors = GetUseLightColors(themeMode);
return GetFluentThemeResourceUri(useLightColors);

if (themeMode == ThemeMode.System)
{
rd = new ResourceDictionary() { Source = new Uri(FluentThemeResourceDictionaryUri + "Fluent.xaml", UriKind.Absolute) };

var colorFileName = useLightColors ? "Light.xaml" : "Dark.xaml";
Uri dictionaryUri = new Uri(FluentColorDictionaryUri + colorFileName, UriKind.Absolute);
rd.MergedDictionaries.Insert(0, new ResourceDictionary() { Source = dictionaryUri });
}
else
{
var themeFileName = useLightColors ? "Fluent.Light.xaml" : "Fluent.Dark.xaml";
rd = new ResourceDictionary() { Source = new Uri(FluentThemeResourceDictionaryUri + themeFileName, UriKind.Absolute) };
}

return rd;
}

#endregion
Expand Down Expand Up @@ -258,8 +243,8 @@ private static void ApplyFluentOnWindow(Window window)
return;

bool useLightColors = GetUseLightColors(window.ThemeMode);
var fluentThemeResourceUri = GetFluentThemeResourceUri(useLightColors);
AddOrUpdateThemeResources(window.Resources, fluentThemeResourceUri);
ResourceDictionary rd = GetFluentThemeDictionary(window.ThemeMode);
AddOrUpdateThemeResources(window.Resources, rd);
ApplyStyleOnWindow(window, useLightColors);

if (!FluentEnabledWindows.HasItem(window))
Expand Down Expand Up @@ -316,8 +301,6 @@ private static void ApplyStyleOnWindow(Window window, bool useLightColors)

#region Internal Properties

internal static bool IsAppThemeModeSyncEnabled { get; set; } = false;

internal static bool IsFluentThemeEnabled
{
get
Expand Down Expand Up @@ -390,30 +373,11 @@ private static ThemeMode GetThemeModeFromSourceUri(Uri source)
}
}

private static Uri GetFluentThemeResourceUri(bool useLightMode)
private static void AddOrUpdateThemeResources(ResourceDictionary rd, ResourceDictionary newDictionary)
{
string themeFileName;

if (SystemParameters.HighContrast)
{
themeFileName = "Fluent.HC.xaml";
}
else
{
themeFileName = useLightMode ? FluentLightDictionary : FluentDarkDictionary;
}

return new Uri(FluentThemeResourceDictionaryUri + themeFileName, UriKind.Absolute);
}

private static void AddOrUpdateThemeResources(ResourceDictionary rd, Uri dictionaryUri)
{
if (rd == null)
if (rd == null || newDictionary == null)
return;

ArgumentNullException.ThrowIfNull(dictionaryUri);

var newDictionary = new ResourceDictionary() { Source = dictionaryUri };
int index = LastIndexOfFluentThemeDictionary(rd);

if (index >= 0)
Expand Down Expand Up @@ -485,6 +449,7 @@ private static bool IsSystemThemeLight()


#region Private Fields
private const string FluentColorDictionaryUri = "pack://application:,,,/PresentationFramework.Fluent;component/Resources/Theme/";
private const string FluentThemeResourceDictionaryUri = "pack://application:,,,/PresentationFramework.Fluent;component/Themes/";
private const string RegPersonalizeKeyPath = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize";
private const string FluentLightDictionary = "Fluent.Light.xaml";
Expand Down
17 changes: 1 addition & 16 deletions src/Microsoft.DotNet.Wpf/src/PresentationFramework/System/Windows/Window.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2558,24 +2558,9 @@ internal void CreateSourceWindow(bool duringShow)

if (Standard.Utility.IsOSWindows10OrNewer)
{
if(!ThemeManager.IsAppThemeModeSyncEnabled)
{
ThemeManager.SyncThemeModeAndResources();
ThemeManager.IsAppThemeModeSyncEnabled = true;
}

if(ThemeManager.IsFluentThemeEnabled)
{

if(ThemeManager.DeferredAppThemeLoading)
{
ThemeManager.OnApplicationThemeChanged(ThemeMode.None, Application.Current.ThemeMode);
ThemeManager.DeferredAppThemeLoading = false;
}
else
{
ThemeManager.ApplyStyleOnWindow(this);
}
ThemeManager.ApplyStyleOnWindow(this);
}

if(_deferThemeLoading)
Expand Down