From c4d2b15c48992f592b223609c0665fa91701c79c Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 21 Sep 2025 01:06:42 +0800
Subject: [PATCH] =?UTF-8?q?add:=E4=B8=BB=E9=A2=98=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml                    |  42 +++++++++---------
 Ink Canvas/Resources/Styles/Dark.xaml         |   4 ++
 Ink Canvas/Resources/Styles/Light.xaml        |   4 ++
 ...vasForClass.csproj.AssemblyReference.cache | Bin 38181 -> 38044 bytes
 4 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 73e81646..2bc47e8c 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -4091,13 +4091,13 @@
                     <Grid Name="BlackboardLeftSide" Visibility="Visible" Margin="0,0,0,3" Height="50"
                           HorizontalAlignment="Center" VerticalAlignment="Bottom">
                         <ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
-                            <Border CornerRadius="5,5,5,5" Background="#f4f4f5" Margin="0,0,0,0">
+                            <Border CornerRadius="5,5,5,5" Background="{DynamicResource BoardFloatBarBackground}" Margin="0,0,0,0">
                                 <ui:SimpleStackPanel Orientation="Horizontal">
                                     <Border Width="60" Height="50"
                                             IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchPrevious, Path=IsEnabled}"
-                                            BorderThickness="1,1,0,1" BorderBrush="#a1a1aa"
+                                            BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             MouseUp="BtnWhiteBoardSwitchPrevious_Click" CornerRadius="5,0,0,5"
-                                            Background="#f4f4f5"
+                                            Background="{DynamicResource BoardFloatBarBackground}"
                                             Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
@@ -4121,7 +4121,7 @@
                                     </Border>
                                     <Border Width="75" Height="50" MouseUp="BtnWhiteBoardPageIndex_Click"
                                             Name="BtnLeftPageListWB"
-                                            BorderThickness="1,1,1,1" BorderBrush="#a1a1aa" Background="#f4f4f5"
+                                            BorderThickness="1,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" Background="{DynamicResource BoardFloatBarBackground}"
                                             Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <TextBlock HorizontalAlignment="Center"
@@ -4152,7 +4152,7 @@
                                                         <DataTemplate>
                                                             <ui:SimpleStackPanel Orientation="Vertical"
                                                                 MouseUp="BlackBoardLeftSidePageListView_OnMouseUp">
-                                                                <Border Margin="0,4" Width="160" BorderBrush="#a1a1aa"
+                                                                <Border Margin="0,4" Width="160" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                                                         BorderThickness="1">
                                                                     <Grid>
                                                                         <Viewbox Width="160">
@@ -4187,8 +4187,8 @@
                                     <Border Width="60" Height="50" MouseUp="BtnWhiteBoardSwitchNext_Click"
                                             CornerRadius="0,5,5,0"
                                             IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchNext, Path=IsEnabled}"
-                                            BorderThickness="0,1,1,1" BorderBrush="#a1a1aa"
-                                            Background="#f4f4f5" Opacity="0.95">
+                                            BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
+                                            Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
@@ -4212,8 +4212,8 @@
                                 </ui:SimpleStackPanel>
                             </Border>
                             <Border Width="60" Height="50"
-                                    BorderThickness="1" BorderBrush="#a1a1aa"
-                                    MouseUp="BtnWhiteBoardAdd_Click" CornerRadius="5" Background="#f4f4f5"
+                                    BorderThickness="1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
+                                    MouseUp="BtnWhiteBoardAdd_Click" CornerRadius="5" Background="{DynamicResource BoardFloatBarBackground}"
                                     Opacity="0.95">
                                 <Grid Margin="6,6,6,4">
                                     <Image VerticalAlignment="Top"
@@ -4245,12 +4245,12 @@
                     <Grid x:Name="BlackboardCenterSide" Visibility="Visible" Margin="0,0,0,3" Height="50"
                           HorizontalAlignment="Center" VerticalAlignment="Bottom">
                         <ui:SimpleStackPanel Orientation="Horizontal">
-                            <Border CornerRadius="5,5,5,5" Background="#f4f4f5" Margin="0,0,5,0">
+                            <Border CornerRadius="5,5,5,5" Background="{DynamicResource BoardFloatBarBackground}" Margin="0,0,5,0">
                                 <ui:SimpleStackPanel Orientation="Horizontal">
                                     <Border Width="60" Height="50" MouseDown="Border_MouseDown" Name="BoardGesture"
                                             MouseUp="TwoFingerGestureBorder_MouseUp" CornerRadius="5,0,0,5"
-                                            Background="#f4f4f5"
-                                            Opacity="1" BorderThickness="1,1,0,1" BorderBrush="#a1a1aa">
+                                            Background="{DynamicResource BoardFloatBarBackground}"
+                                            Opacity="1" BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
@@ -6225,8 +6225,8 @@
                           HorizontalAlignment="Center" VerticalAlignment="Bottom">
                         <ui:SimpleStackPanel Orientation="Horizontal" Spacing="5">
                             <Border Width="60" Height="50"
-                                    BorderThickness="1" BorderBrush="#a1a1aa"
-                                    MouseUp="BtnWhiteBoardAdd_Click" CornerRadius="5" Background="#f4f4f5"
+                                    BorderThickness="1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
+                                    MouseUp="BtnWhiteBoardAdd_Click" CornerRadius="5" Background="{DynamicResource BoardFloatBarBackground}"
                                     Opacity="0.95">
                                 <Grid Margin="6,6,6,4">
                                     <Image VerticalAlignment="Top"
@@ -6246,13 +6246,13 @@
                                                HorizontalAlignment="Center" FontSize="12" />
                                 </Grid>
                             </Border>
-                            <Border CornerRadius="5,5,5,5" Background="#f4f4f5" Margin="0,0,0,0">
+                            <Border CornerRadius="5,5,5,5" Background="{DynamicResource BoardFloatBarBackground}" Margin="0,0,0,0">
                                 <ui:SimpleStackPanel Orientation="Horizontal">
                                     <Border Width="60" Height="50"
                                             IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchPrevious, Path=IsEnabled}"
-                                            BorderThickness="1,1,0,1" BorderBrush="#a1a1aa"
+                                            BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             MouseUp="BtnWhiteBoardSwitchPrevious_Click" CornerRadius="5,0,0,5"
-                                            Background="#f4f4f5"
+                                            Background="{DynamicResource BoardFloatBarBackground}"
                                             Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
@@ -6276,7 +6276,7 @@
                                     </Border>
                                     <Border Width="75" Height="50" MouseUp="BtnWhiteBoardPageIndex_Click"
                                             Name="BtnRightPageListWB"
-                                            BorderThickness="1,1,1,1" BorderBrush="#a1a1aa" Background="#f4f4f5"
+                                            BorderThickness="1,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" Background="{DynamicResource BoardFloatBarBackground}"
                                             Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <TextBlock HorizontalAlignment="Center"
@@ -6307,7 +6307,7 @@
                                                         <DataTemplate>
                                                             <ui:SimpleStackPanel Orientation="Vertical"
                                                                 MouseUp="BlackBoardRightSidePageListView_OnMouseUp">
-                                                                <Border Margin="0,4" Width="160" BorderBrush="#a1a1aa"
+                                                                <Border Margin="0,4" Width="160" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                                                         BorderThickness="1">
                                                                     <Grid>
                                                                         <Viewbox Width="160">
@@ -6342,8 +6342,8 @@
                                     <Border Width="60" Height="50" MouseUp="BtnWhiteBoardSwitchNext_Click"
                                             IsEnabled="{Binding ElementName=BtnWhiteBoardSwitchNext, Path=IsEnabled}"
                                             CornerRadius="0,5,5,0"
-                                            BorderThickness="0,1,1,1" BorderBrush="#a1a1aa"
-                                            Background="#f4f4f5" Opacity="0.95">
+                                            BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
+                                            Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
diff --git a/Ink Canvas/Resources/Styles/Dark.xaml b/Ink Canvas/Resources/Styles/Dark.xaml
index 1a7cfee4..a7c7e39c 100644
--- a/Ink Canvas/Resources/Styles/Dark.xaml	
+++ b/Ink Canvas/Resources/Styles/Dark.xaml	
@@ -20,4 +20,8 @@
     <Color x:Key="FloatBarButtonBackgroundKey">Transparent</Color>
     <Color x:Key="FloatBarButtonBackgroundPointerOverKey">#2200CDCD</Color>
     <Color x:Key="FloatBarButtonButtonBackgroundPressedKey">#4400CDCD</Color>
+    
+    <!-- 白板模式浮动栏颜色 -->
+    <SolidColorBrush x:Key="BoardFloatBarBackground" Color="#2a2a2a" />
+    <SolidColorBrush x:Key="BoardFloatBarBorderBrush" Color="#555555" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Ink Canvas/Resources/Styles/Light.xaml b/Ink Canvas/Resources/Styles/Light.xaml
index 5413bc30..9b46dc1c 100644
--- a/Ink Canvas/Resources/Styles/Light.xaml	
+++ b/Ink Canvas/Resources/Styles/Light.xaml	
@@ -20,4 +20,8 @@
     <Color x:Key="FloatBarButtonBackgroundKey">Transparent</Color>
     <Color x:Key="FloatBarButtonBackgroundPointerOverKey">#66FFFFFF</Color>
     <Color x:Key="FloatBarButtonButtonBackgroundPressedKey">#99FFFFFF</Color>
+    
+    <!-- 白板模式浮动栏颜色 -->
+    <SolidColorBrush x:Key="BoardFloatBarBackground" Color="#f4f4f5" />
+    <SolidColorBrush x:Key="BoardFloatBarBorderBrush" Color="#a1a1aa" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index 57d842b8b7d92d5308ee26301638a87ff9085d80..c8c2dfbd497b829755ee6211820ad2e2d43c9d13 100644
GIT binary patch
delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi

delta 70
zcmbQUl4<EGCJr`6BL)Tr#>B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb