From 1957288219e25e31a9b1a04fc1b1c9590583dfaa Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 21 Sep 2025 01:15:01 +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 +++++++++---------
 ...vasForClass.csproj.AssemblyReference.cache | Bin 38044 -> 38181 bytes
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 2bc47e8c..e5634dce 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -4426,8 +4426,8 @@
                                     </Grid>
                                     <Border Width="60" Height="50" MouseDown="Border_MouseDown"
                                             MouseUp="BoardChangeBackgroundColorBtn_MouseUp" CornerRadius="0,5,5,0"
-                                            Background="#f4f4f5" Opacity="1" BorderThickness="0,1,1,1"
-                                            BorderBrush="#a1a1aa">
+                                            Background="{DynamicResource BoardFloatBarBackground}" Opacity="1" BorderThickness="0,1,1,1"
+                                            BorderBrush="{DynamicResource BoardFloatBarBorderBrush}">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
@@ -4449,12 +4449,12 @@
                                 </ui:SimpleStackPanel>
                             </Border>
 
-                            <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 x:Name="BoardSelect" Width="60" Height="50" MouseDown="Border_MouseDown"
-                                            BorderThickness="1,1,0,1" BorderBrush="#a1a1aa"
+                                            BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             MouseUp="SymbolIconSelect_MouseUp" CornerRadius="5,0,0,5"
-                                            Background="#f4f4f5"
+                                            Background="{DynamicResource BoardFloatBarBackground}"
                                             Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
@@ -4477,8 +4477,8 @@
                                         </Grid>
                                     </Border>
                                     <Border x:Name="BoardPen" Width="60" Height="50" MouseDown="Border_MouseDown"
-                                            BorderThickness="0,1,0,1" BorderBrush="#a1a1aa"
-                                            MouseUp="PenIcon_Click" Background="#f4f4f5" Opacity="0.95">
+                                            BorderThickness="0,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
+                                            MouseUp="PenIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image x:Name="BoardPenIcon" VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
@@ -5383,8 +5383,8 @@
                                         </Grid>
                                     </Border>
                                     <Border x:Name="BoardEraser" Width="60" Height="50" MouseDown="Border_MouseDown"
-                                            BorderThickness="0,1,1,1" BorderBrush="#a1a1aa"
-                                            MouseUp="BoardEraserIcon_Click" Background="#f4f4f5" Opacity="0.95">
+                                            BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
+                                            MouseUp="BoardEraserIcon_Click" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
@@ -5607,7 +5607,7 @@
                                     <Border x:Name="BoardEraserByStrokes" Width="60" Height="55"
                                             MouseDown="Border_MouseDown"
                                             Visibility="Collapsed"
-                                            MouseUp="BoardEraserIconByStrokes_Click" Background="LightGray"
+                                            MouseUp="BoardEraserIconByStrokes_Click" Background="{DynamicResource BoardFloatBarBackground}"
                                             Opacity="0.85">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
@@ -5618,8 +5618,8 @@
                                         </Grid>
                                     </Border>
                                     <Border x:Name="BoardGeometry" Width="60" Height="50" MouseDown="Border_MouseDown"
-                                            BorderThickness="0,1,1,1" BorderBrush="#a1a1aa"
-                                            MouseUp="ImageDrawShape_MouseUp" Background="#f4f4f5" Opacity="0.95">
+                                            BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
+                                            MouseUp="ImageDrawShape_MouseUp" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
@@ -5791,8 +5791,8 @@
                                         </Border>
                                     </Border>
                                     <Border x:Name="BoardInsertImage" Width="60" Height="50" MouseDown="Border_MouseDown"
-                                            BorderThickness="0,1,0,1" BorderBrush="#a1a1aa"
-                                            MouseUp="InsertImageOptions_MouseUp" Background="#f4f4f5" Opacity="0.95">
+                                            BorderThickness="0,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
+                                            MouseUp="InsertImageOptions_MouseUp" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
@@ -5896,7 +5896,7 @@
                                             </Border>
                                         </Grid>
                                     </Border>
-                                    <Border x:Name="BoardUndo" Width="60" Height="50" MouseDown="Border_MouseDown" MouseUp="SymbolIconUndo_MouseUp" BorderThickness="0,1,0,1" BorderBrush="#a1a1aa" IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}" Background="#f4f4f5" Opacity="0.95">
+                                    <Border x:Name="BoardUndo" Width="60" Height="50" MouseDown="Border_MouseDown" MouseUp="SymbolIconUndo_MouseUp" BorderThickness="0,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20" Opacity="{Binding ElementName=BtnUndo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}">
@@ -5914,7 +5914,7 @@
                                             <TextBlock Text="撤销" Foreground="{DynamicResource FloatBarForeground}" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="12" />
                                         </Grid>
                                     </Border>
-                                    <Border x:Name="BoardRedo" Width="60" Height="50" CornerRadius="0,5,5,0" MouseDown="Border_MouseDown" MouseUp="SymbolIconRedo_MouseUp" BorderThickness="0,1,1,1" BorderBrush="#a1a1aa" IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}" Background="#f4f4f5" Opacity="0.95">
+                                    <Border x:Name="BoardRedo" Width="60" Height="50" CornerRadius="0,5,5,0" MouseDown="Border_MouseDown" MouseUp="SymbolIconRedo_MouseUp" BorderThickness="0,1,1,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}" IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top" RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20" Opacity="{Binding ElementName=BtnRedo, Path=IsEnabled, Converter={StaticResource IsEnabledToOpacityConverter}}">
                                                 <Image.Source>
@@ -5935,11 +5935,11 @@
                                 </ui:SimpleStackPanel>
                             </Border>
 
-                            <Border CornerRadius="5,5,5,5" Background="#f4f4f5">
+                            <Border CornerRadius="5,5,5,5" Background="{DynamicResource BoardFloatBarBackground}">
                                 <ui:SimpleStackPanel Orientation="Horizontal">
                                     <Border Width="60" Height="50" MouseDown="Border_MouseDown"
-                                            MouseUp="SymbolIconTools_MouseUp" Background="#f4f4f5" Opacity="0.95"
-                                            BorderThickness="1,1,0,1" BorderBrush="#a1a1aa"
+                                            MouseUp="SymbolIconTools_MouseUp" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95"
+                                            BorderThickness="1,1,0,1" BorderBrush="{DynamicResource BoardFloatBarBorderBrush}"
                                             CornerRadius="5,0,0,5">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
@@ -6191,9 +6191,9 @@
                                     </Border>
                                     <Border Width="60" Height="50" MouseDown="Border_MouseDown"
                                             MouseUp="ImageBlackboard_MouseUp"
-                                            CornerRadius="0,5,5,0" Background="#f4f4f5" Opacity="0.95"
+                                            CornerRadius="0,5,5,0" Background="{DynamicResource BoardFloatBarBackground}" Opacity="0.95"
                                             BorderThickness="0,1,1,1"
-                                            BorderBrush="#a1a1aa">
+                                            BorderBrush="{DynamicResource BoardFloatBarBorderBrush}">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
diff --git a/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache b/Ink Canvas/obj/Debug/net472/InkCanvasForClass.csproj.AssemblyReference.cache
index c8c2dfbd497b829755ee6211820ad2e2d43c9d13..57d842b8b7d92d5308ee26301638a87ff9085d80 100644
GIT binary patch
delta 70
zcmbQUl4<EGCJr`6BL)Tr#>B~nPN5rP?War*kO`k`FUd8TkDE=&SuZ6ghmjGefZ>7T
XjqeIqIY4T;%1rbO^o$LR4J{b}mk1Gb

delta 23
fcmZ3wifPVDCJr`6Lk0#0#>B~nPN5rP?WX_$OSlGi