add:主题切换

Ink Canvas/MainWindow.xaml

@@ -6291,7 +6291,7 @@
                                         <Border ClipToBounds="True" Name="BoardBorderRightPageListView"
                                                 Margin="-138,-465,-56,50"
                                                 CornerRadius="8"
-                                                Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderBrush="#a1a1aa"
+                                                Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                                 BorderThickness="1">
                                             <ui:ScrollViewerEx Name="BlackBoardRightSidePageListScrollViewer"
                                                                Height="460"

Ink Canvas/MainWindow_cs/MW_AutoTheme.cs

@@ -31,7 +31,13 @@ namespace Ink_Canvas
                 Application.Current.Resources.MergedDictionaries.Remove(dict);
             }
 
-            // 先添加其他资源
+            if (theme == "Light")
+            {
+                var rd1 = new ResourceDictionary
+                { Source = new Uri("Resources/Styles/Light.xaml", UriKind.Relative) };
+                Application.Current.Resources.MergedDictionaries.Add(rd1);
+                
+                // 在主题资源之后添加其他资源
                 var rd2 = new ResourceDictionary
                 { Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative) };
                 Application.Current.Resources.MergedDictionaries.Add(rd2);
@@ -44,12 +50,6 @@ namespace Ink_Canvas
                 { Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative) };
                 Application.Current.Resources.MergedDictionaries.Add(rd4);
 
-            if (theme == "Light")
-            {
-                var rd1 = new ResourceDictionary
-                { Source = new Uri("Resources/Styles/Light.xaml", UriKind.Relative) };
-                Application.Current.Resources.MergedDictionaries.Add(rd1);
-
                 ThemeManager.SetRequestedTheme(window, ElementTheme.Light);
 
                 InitializeFloatBarForegroundColor();
@@ -62,6 +62,19 @@ namespace Ink_Canvas
                 var rd1 = new ResourceDictionary { Source = new Uri("Resources/Styles/Dark.xaml", UriKind.Relative) };
                 Application.Current.Resources.MergedDictionaries.Add(rd1);
                 
+                // 在主题资源之后添加其他资源
+                var rd2 = new ResourceDictionary
+                { Source = new Uri("Resources/DrawShapeImageDictionary.xaml", UriKind.Relative) };
+                Application.Current.Resources.MergedDictionaries.Add(rd2);
+
+                var rd3 = new ResourceDictionary
+                { Source = new Uri("Resources/SeewoImageDictionary.xaml", UriKind.Relative) };
+                Application.Current.Resources.MergedDictionaries.Add(rd3);
+
+                var rd4 = new ResourceDictionary
+                { Source = new Uri("Resources/IconImageDictionary.xaml", UriKind.Relative) };
+                Application.Current.Resources.MergedDictionaries.Add(rd4);
+
                 ThemeManager.SetRequestedTheme(window, ElementTheme.Dark);
 
                 InitializeFloatBarForegroundColor();

Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs

@@ -84,11 +84,23 @@ namespace Ink_Canvas
                 EnableTwoFingerGestureBtn.Source =
                     new BitmapImage(new Uri("/Resources/new-icons/gesture.png", UriKind.Relative));
 
+                // 根据主题设置颜色
+                if (Settings.Appearance.Theme == 1) // 深色主题
+                {
+                    BoardGesture.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42)); 
+                    BoardGestureGeometry.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                    BoardGestureGeometry2.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                    BoardGestureLabel.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                    BoardGesture.BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85)); 
+                }
+                else // 浅色主题或跟随系统
+                {
                     BoardGesture.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245)); 
                     BoardGestureGeometry.Brush = new SolidColorBrush(Color.FromRgb(24, 24, 27)); 
                     BoardGestureGeometry2.Brush = new SolidColorBrush(Color.FromRgb(24, 24, 27)); 
                     BoardGestureLabel.Foreground = new SolidColorBrush(Color.FromRgb(24, 24, 27)); 
                     BoardGesture.BorderBrush = new SolidColorBrush(Color.FromRgb(161, 161, 170)); 
+                }
                 BoardGestureGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.DisabledGestureIcon);
                 BoardGestureGeometry2.Geometry = Geometry.Parse("F0 M24,24z M0,0z");
 
@@ -122,11 +134,23 @@ namespace Ink_Canvas
                     EnableTwoFingerGestureBtn.Source =
                         new BitmapImage(new Uri("/Resources/new-icons/gesture.png", UriKind.Relative));
 
+                    // 根据主题设置颜色
+                    if (Settings.Appearance.Theme == 1) // 深色主题
+                    {
+                        BoardGesture.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42)); 
+                        BoardGestureGeometry.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                        BoardGestureGeometry2.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                        BoardGestureLabel.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                        BoardGesture.BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85)); 
+                    }
+                    else // 浅色主题或跟随系统
+                    {
                         BoardGesture.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245));
                         BoardGestureGeometry.Brush = new SolidColorBrush(Color.FromRgb(24, 24, 27)); 
                         BoardGestureGeometry2.Brush = new SolidColorBrush(Color.FromRgb(24, 24, 27)); 
                         BoardGestureLabel.Foreground = new SolidColorBrush(Color.FromRgb(24, 24, 27)); 
                         BoardGesture.BorderBrush = new SolidColorBrush(Color.FromRgb(161, 161, 170)); 
+                    }
                     BoardGestureGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.DisabledGestureIcon);
                     BoardGestureGeometry2.Geometry = Geometry.Parse("F0 M24,24z M0,0z");
                 }
@@ -417,6 +441,24 @@ namespace Ink_Canvas
                     LassoSelectIconGeometry.Brush = new SolidColorBrush(FloatBarForegroundColor);
                     LassoSelectIconGeometry.Geometry = Geometry.Parse(XamlGraphicsIconGeometries.LinedLassoSelectIcon);
 
+                    // 根据主题设置颜色
+                    if (Settings.Appearance.Theme == 1) // 深色主题
+                    {
+                        BoardPen.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42)); 
+                        BoardSelect.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42)); 
+                        BoardEraser.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42)); 
+                        BoardSelectGeometry.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                        BoardPenGeometry.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                        BoardEraserGeometry.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                        BoardPenLabel.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                        BoardSelectLabel.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                        BoardEraserLabel.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                        BoardSelect.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)); 
+                    }
+                    else // 浅色主题或跟随系统
+                    {
                         BoardPen.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245)); 
                         BoardSelect.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245)); 
                         BoardEraser.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245)); 
@@ -429,6 +471,7 @@ namespace Ink_Canvas
                         BoardSelect.BorderBrush = new SolidColorBrush(Color.FromRgb(161, 161, 170)); 
                         BoardEraser.BorderBrush = new SolidColorBrush(Color.FromRgb(161, 161, 170)); 
                         BoardPen.BorderBrush = new SolidColorBrush(Color.FromRgb(161, 161, 170)); 
+                    }
 
                     HideFloatingBarHighlight();
                 }
@@ -492,10 +535,21 @@ namespace Ink_Canvas
                             CursorIconGeometry.Brush = new SolidColorBrush(Color.FromRgb(30, 58, 138));
                             CursorIconGeometry.Geometry =
                                 Geometry.Parse(XamlGraphicsIconGeometries.LinedCursorIcon);
+                            // 根据主题设置颜色
+                            if (Settings.Appearance.Theme == 1) // 深色主题
+                            {
+                                BoardPen.Background = new SolidColorBrush(Color.FromRgb(42, 42, 42)); 
+                                BoardPen.BorderBrush = new SolidColorBrush(Color.FromRgb(85, 85, 85)); 
+                                BoardPenGeometry.Brush = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                                BoardPenLabel.Foreground = new SolidColorBrush(Color.FromRgb(255, 255, 255)); 
+                            }
+                            else // 浅色主题或跟随系统
+                            {
                                 BoardPen.Background = new SolidColorBrush(Color.FromRgb(244, 244, 245)); 
                                 BoardPen.BorderBrush = new SolidColorBrush(Color.FromRgb(161, 161, 170)); 
                                 BoardPenGeometry.Brush = new SolidColorBrush(Color.FromRgb(24, 24, 27)); 
                                 BoardPenLabel.Foreground = new SolidColorBrush(Color.FromRgb(24, 24, 27)); 
+                            }
 
                             SetFloatingBarHighlightPosition("cursor");
                             break;