CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improve:主题适配

Browse Source
This commit is contained in:
CJKmkp
2026-01-17 17:22:46 +08:00
parent 76babf4dd3
commit e69175e5c4
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
+8 -6
View File
@@ -431,8 +431,9 @@ namespace Ink_Canvas
LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor); LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
LassoSelectIconGeometry.Geometry = Geometry.Parse(GetCorrectIcon("lassoSelect", false)); LassoSelectIconGeometry.Geometry = Geometry.Parse(GetCorrectIcon("lassoSelect", false));
// 根据主题设置颜色 bool isDarkThemeForButtons = Settings.Appearance.Theme == 1 ||
if (Settings.Appearance.Theme == 1) // 深色主题 (Settings.Appearance.Theme == 2 && !IsSystemThemeLight());
if (isDarkThemeForButtons)
{ {
BoardPen.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42)); BoardPen.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42));
BoardSelect.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42)); BoardSelect.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42));
@@ -447,7 +448,7 @@ namespace Ink_Canvas
BoardEraser.BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85)); BoardEraser.BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85));
BoardPen.BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85)); BoardPen.BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85));
} }
else // 浅色主题或跟随系统 else
{ {
BoardPen.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245)); BoardPen.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245));
BoardSelect.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245)); BoardSelect.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245));
@@ -539,15 +540,16 @@ namespace Ink_Canvas
CursorIconGeometry.Brush = new SolidColorBrush(highlightColor); CursorIconGeometry.Brush = new SolidColorBrush(highlightColor);
CursorIconGeometry.Geometry = CursorIconGeometry.Geometry =
Geometry.Parse(GetCorrectIcon("cursor", true)); Geometry.Parse(GetCorrectIcon("cursor", true));
// 根据主题设置颜色 bool isDarkThemeForCursor = Settings.Appearance.Theme == 1 ||
if (Settings.Appearance.Theme == 1) // 深色主题 (Settings.Appearance.Theme == 2 && !IsSystemThemeLight());
if (isDarkThemeForCursor)
{ {
BoardPen.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42)); BoardPen.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42));
BoardPen.BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85)); BoardPen.BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85));
BoardPenGeometry.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255)); BoardPenGeometry.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255));
BoardPenLabel.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 255)); BoardPenLabel.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 255));
} }
else // 浅色主题或跟随系统 else
{ {
BoardPen.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245)); BoardPen.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245));
BoardPen.BorderBrush = new SolidColorBrush(Color.FromRgb(161, 161, 170)); BoardPen.BorderBrush = new SolidColorBrush(Color.FromRgb(161, 161, 170));
Ink Canvas/Windows/SettingsViews/SettingsWindow.xaml.cs
+4 -6
View File
@@ -1,4 +1,4 @@
using iNKORE.UI.WPF.Helpers; using iNKORE.UI.WPF.Helpers;
using Ink_Canvas.Windows.SettingsViews; using Ink_Canvas.Windows.SettingsViews;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
@@ -367,11 +367,10 @@ namespace Ink_Canvas.Windows
if (isDarkTheme) if (isDarkTheme)
{ {
// 深色主题 - 参考 Windows 系统设置
if (MainBorder != null) if (MainBorder != null)
{ {
MainBorder.Background = ThemeHelper.GetBackgroundPrimaryBrush(); // Windows 系统主背景 #202020 MainBorder.Background = new SolidColorBrush(Color.FromRgb(43, 43, 43));
MainBorder.BorderBrush = new SolidColorBrush(Color.FromRgb(0, 120, 215)); // Windows 系统强调色（蓝色） MainBorder.BorderBrush = new SolidColorBrush(Color.FromRgb(0, 120, 215));
} }
if (SidebarBorder != null) if (SidebarBorder != null)
{ {
@@ -449,10 +448,9 @@ namespace Ink_Canvas.Windows
} }
else else
{ {
// 浅色主题（默认）
if (MainBorder != null) if (MainBorder != null)
{ {
MainBorder.Background = new SolidColorBrush(Color.FromRgb(250, 250, 250)); MainBorder.Background = new SolidColorBrush(Color.FromRgb(255, 255, 255));
MainBorder.BorderBrush = new SolidColorBrush(Color.FromRgb(53, 132, 228)); MainBorder.BorderBrush = new SolidColorBrush(Color.FromRgb(53, 132, 228));
} }
if (SidebarBorder != null) if (SidebarBorder != null)