From 495267574904cd1af0cebca826cef64e7aa16ef2 Mon Sep 17 00:00:00 2001 From: IceStormNG Date: Fri, 18 Aug 2023 18:36:34 +0200 Subject: [PATCH 1/2] Light/Dark mode override --- app/UI/CustomControls.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/UI/CustomControls.cs b/app/UI/CustomControls.cs index cb7cbdc6..3b8a935c 100644 --- a/app/UI/CustomControls.cs +++ b/app/UI/CustomControls.cs @@ -62,6 +62,16 @@ namespace GHelper.UI private static bool IsDarkTheme() { + if (AppConfig.GetString("ui_mode").ToLower() == "dark") + { + return true; + } + + if (AppConfig.GetString("ui_mode").ToLower() == "light") + { + return false; + } + using var key = Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize"); var registryValueObject = key?.GetValue("AppsUseLightTheme"); From 2384649e095b981bdb9abd13d2f003597eef4083 Mon Sep 17 00:00:00 2001 From: IceStormNG Date: Fri, 18 Aug 2023 18:37:58 +0200 Subject: [PATCH 2/2] Better handling for null values. --- app/UI/CustomControls.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/UI/CustomControls.cs b/app/UI/CustomControls.cs index 3b8a935c..a2ebf4b9 100644 --- a/app/UI/CustomControls.cs +++ b/app/UI/CustomControls.cs @@ -62,12 +62,14 @@ namespace GHelper.UI private static bool IsDarkTheme() { - if (AppConfig.GetString("ui_mode").ToLower() == "dark") + string? uiMode = AppConfig.GetString("ui_mode"); + + if (uiMode is not null && uiMode.ToLower() == "dark") { return true; } - if (AppConfig.GetString("ui_mode").ToLower() == "light") + if (uiMode is not null && uiMode.ToLower() == "light") { return false; }