Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

[PT Run] Fix theme setting (#30237)

Browse Source 
* [PT Run] Fix theme settings

* Do not react on theme change when OS theme is high contrast

* Fix initial theme set
This commit is contained in:
Stefan Markovic
2023-12-07 13:08:26 +01:00
committed by GitHub
parent d0acc8e911
commit d61aa3aaa2
1 changed files with 35 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/modules/launcher/PowerLauncher/App.xaml.cs
View File

@@ -23,6 +23,7 @@ using Wox.Infrastructure.Image;
using Wox.Infrastructure.UserSettings; using Wox.Infrastructure.UserSettings;
using Wox.Plugin; using Wox.Plugin;
using Wox.Plugin.Logger; using Wox.Plugin.Logger;
using Wpf.Ui.Appearance;
using Stopwatch = Wox.Infrastructure.Stopwatch; using Stopwatch = Wox.Infrastructure.Stopwatch;
namespace PowerLauncher namespace PowerLauncher
@@ -152,6 +153,9 @@ namespace PowerLauncher
_settingsReader.ReadSettingsOnChange(); _settingsReader.ReadSettingsOnChange();
_themeManager.ThemeChanged += OnThemeChanged; _themeManager.ThemeChanged += OnThemeChanged;
OnThemeChanged(_settings.Theme, _settings.Theme);
textToLog.AppendLine("End PowerToys Run startup ---------------------------------------------------- "); textToLog.AppendLine("End PowerToys Run startup ---------------------------------------------------- ");
bootTime.Stop(); bootTime.Stop();
@@ -217,6 +221,37 @@ namespace PowerLauncher
/// <param name="newTheme">Current Theme</param> /// <param name="newTheme">Current Theme</param>
private void OnThemeChanged(Theme oldTheme, Theme newTheme) private void OnThemeChanged(Theme oldTheme, Theme newTheme)
{ {
// If OS theme is high contrast, don't change theme.
if (SystemParameters.HighContrast)
{
return;
}
ApplicationTheme theme = ApplicationTheme.Unknown;
switch (newTheme)
{
case Theme.Dark:
theme = ApplicationTheme.Dark; break;
case Theme.Light:
theme = ApplicationTheme.Light; break;
case Theme.HighContrastWhite:
case Theme.HighContrastBlack:
case Theme.HighContrastOne:
case Theme.HighContrastTwo:
theme = ApplicationTheme.HighContrast; break;
default:
break;
}
_mainWindow?.Dispatcher.Invoke(() =>
{
if (theme != ApplicationTheme.Unknown)
{
ApplicationThemeManager.Apply(theme);
}
});
ImageLoader.UpdateIconPath(newTheme); ImageLoader.UpdateIconPath(newTheme);
_mainVM.Query(); _mainVM.Query();
} }