From 97dbedfed5e255c6adb2bb077cc017181f4915f6 Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Fri, 1 May 2026 09:31:10 +0800 Subject: [PATCH] improve:UI --- Ink Canvas/Resources/Settings.cs | 2 +- .../Windows/SettingsViews/SettingsWindow.xaml.cs | 16 +++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/Ink Canvas/Resources/Settings.cs b/Ink Canvas/Resources/Settings.cs index 004b11db..50fd6ff8 100644 --- a/Ink Canvas/Resources/Settings.cs +++ b/Ink Canvas/Resources/Settings.cs @@ -303,7 +303,7 @@ namespace Ink_Canvas [JsonProperty("isShowModeFingerToggleSwitch")] public bool IsShowModeFingerToggleSwitch { get; set; } = true; [JsonProperty("theme")] - public int Theme { get; set; } + public int Theme { get; set; } = 2; // 浮动栏按钮显示控制 [JsonProperty("useLegacyFloatingBarUI")] diff --git a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs index 32862577..2041515d 100644 --- a/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs +++ b/Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs @@ -141,13 +141,27 @@ namespace Ink_Canvas.Windows.SettingsViews { 0 => iNKORE.UI.WPF.Modern.ElementTheme.Light, 1 => iNKORE.UI.WPF.Modern.ElementTheme.Dark, - _ => iNKORE.UI.WPF.Modern.ElementTheme.Default, + _ => IsSystemThemeLight() ? iNKORE.UI.WPF.Modern.ElementTheme.Light : iNKORE.UI.WPF.Modern.ElementTheme.Dark, }; iNKORE.UI.WPF.Modern.ThemeManager.SetRequestedTheme(this, elementTheme); } catch { } } + private static bool IsSystemThemeLight() + { + try + { + using (var themeKey = Microsoft.Win32.Registry.CurrentUser.OpenSubKey( + @"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize")) + { + if (themeKey?.GetValue("SystemUsesLightTheme") is int v) return v == 1; + } + } + catch { } + return false; + } + #region 修复触摸屏鼠标指针消失问题 [System.Runtime.InteropServices.DllImport("user32.dll")]