DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

UI - Fixed a possible startup freeze on Windows 11

Browse Source
This commit is contained in:
Robert 2021-09-19 18:40:46 +02:00
parent ef4e5b4c3b
commit 26d8322b15
2 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Artemis.UI/Services/Interfaces/IThemeService.cs Normal file
View File

@ -0,0 +1,19 @@
using System;
using Artemis.UI.Events;
namespace Artemis.UI.Services
{
public interface IThemeService : IArtemisUIService
{
WindowsTheme GetAppsTheme();
WindowsTheme GetSystemTheme();
event EventHandler<WindowsThemeEventArgs> AppsThemeChanged;
event EventHandler<WindowsThemeEventArgs> SystemThemeChanged;
enum WindowsTheme
{
Light,
Dark
}
}
}

48
src/Artemis.UI/Services/ThemeService.cs
View File

@ -2,32 +2,56 @@
using System.Globalization; using System.Globalization;
using System.Management; using System.Management;
using System.Security.Principal; using System.Security.Principal;
using System.Threading.Tasks;
using Artemis.Core; using Artemis.Core;
using Artemis.Core.Services; using Artemis.Core.Services;
using Artemis.UI.Events; using Artemis.UI.Events;
using Artemis.UI.Screens.Settings.Tabs.General; using Artemis.UI.Screens.Settings.Tabs.General;
using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf;
using Microsoft.Win32; using Microsoft.Win32;
using Serilog;
namespace Artemis.UI.Services namespace Artemis.UI.Services
{ {
public class ThemeService : IThemeService public class ThemeService : IThemeService
{ {
private readonly ILogger _logger;
private readonly PluginSetting<ApplicationColorScheme> _colorScheme; private readonly PluginSetting<ApplicationColorScheme> _colorScheme;
private const string RegistryKeyPath = @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize"; private const string RegistryKeyPath = @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize";
private const string AppsThemeRegistryValueName = "AppsUseLightTheme"; private const string AppsThemeRegistryValueName = "AppsUseLightTheme";
private const string SystemThemeRegistryValueName = "SystemUsesLightTheme"; private const string SystemThemeRegistryValueName = "SystemUsesLightTheme";
public ThemeService(ISettingsService settingsService) public ThemeService(ISettingsService settingsService, ILogger logger)
{ {
WatchTheme(); _logger = logger;
_colorScheme = settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic); _colorScheme = settingsService.GetSetting("UI.ColorScheme", ApplicationColorScheme.Automatic);
_colorScheme.SettingChanged += ColorSchemeOnSettingChanged; _colorScheme.SettingChanged += ColorSchemeOnSettingChanged;
ApplyColorSchemeSetting();
AppsThemeChanged += OnAppsThemeChanged; AppsThemeChanged += OnAppsThemeChanged;
Task.Run(Initialize);
}
private void Initialize()
{
try
{
WatchTheme();
}
catch (Exception e)
{
_logger.Warning(e, "WatchTheme failed");
}
try
{
ApplyColorSchemeSetting();
}
catch (Exception e)
{
_logger.Warning(e, "ApplyColorSchemeSetting failed");
}
} }
public IThemeService.WindowsTheme GetAppsTheme() public IThemeService.WindowsTheme GetAppsTheme()
@ -123,7 +147,7 @@ namespace Artemis.UI.Services
object registryValueObject = key?.GetValue(themeKeyName); object registryValueObject = key?.GetValue(themeKeyName);
if (registryValueObject == null) return IThemeService.WindowsTheme.Light; if (registryValueObject == null) return IThemeService.WindowsTheme.Light;
int registryValue = (int) registryValueObject; int registryValue = (int)registryValueObject;
return registryValue > 0 ? IThemeService.WindowsTheme.Light : IThemeService.WindowsTheme.Dark; return registryValue > 0 ? IThemeService.WindowsTheme.Light : IThemeService.WindowsTheme.Dark;
} }
@ -159,18 +183,4 @@ namespace Artemis.UI.Services
#endregion #endregion
} }
public interface IThemeService : IArtemisUIService
{
WindowsTheme GetAppsTheme();
WindowsTheme GetSystemTheme();
event EventHandler<WindowsThemeEventArgs> AppsThemeChanged;
event EventHandler<WindowsThemeEventArgs> SystemThemeChanged;
enum WindowsTheme
{
Light,
Dark
}
}
} }