From 05ac0b59c0401571c89a08ffdb6fc950cca680b7 Mon Sep 17 00:00:00 2001
From: kriastans <kriastans@protonmail.com>
Date: Thu, 2 May 2024 21:07:24 +0800
Subject: [PATCH] =?UTF-8?q?[feature]=E8=B0=83=E8=89=B2=E7=9B=98UI=E7=9A=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Ink Canvas.csproj                  |   6 +
 Ink Canvas/MainWindow.xaml                    | 146 +++++++++---------
 .../Resources/new-icons/checked-black.png     | Bin 0 -> 1845 bytes
 .../Resources/new-icons/checked-white.png     | Bin 0 -> 1418 bytes
 4 files changed, 80 insertions(+), 72 deletions(-)
 create mode 100644 Ink Canvas/Resources/new-icons/checked-black.png
 create mode 100644 Ink Canvas/Resources/new-icons/checked-white.png

diff --git a/Ink Canvas/Ink Canvas.csproj b/Ink Canvas/Ink Canvas.csproj
index 2626a03..a017072 100644
--- a/Ink Canvas/Ink Canvas.csproj	
+++ b/Ink Canvas/Ink Canvas.csproj	
@@ -565,5 +565,11 @@
   <ItemGroup>
     <Resource Include="Resources\new-icons\close-white.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\new-icons\checked-white.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\new-icons\checked-black.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index baf8f25..be47e66 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -1396,78 +1396,80 @@
                         <ui:SimpleStackPanel Name="StackPanelCanvasControls" Visibility="Visible" Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
                             <ui:SimpleStackPanel Width="0" Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
                                 <Grid Margin="0,5,0,5" Width="0" RenderTransformOrigin="0.5,0.5">
-                                    <Border x:Name="PenPalette" Visibility="Visible" Background="white" Opacity="0.9" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="8" Margin="-160,-160,-33,32">
-
-                                        <Viewbox Margin="0,-1,0,0">
-                                            <StackPanel Margin="15 10">
-                                                <Viewbox HorizontalAlignment="Center" VerticalAlignment="Center">
-                                                    <ui:SimpleStackPanel>
-                                                        <Controls:UniformGrid Columns="2" Width="300" Height="55">
-                                                            <ui:SimpleStackPanel Orientation="Horizontal" Height="35">
-                                                                <Label Content="笔锋" Margin="0,0,6,0" Foreground="{DynamicResource FloatBarForeground}" FontSize="17" FontWeight="Bold" VerticalAlignment="Center"/>
-                                                                <ComboBox Height="30" VerticalAlignment="Center" Name="ComboBoxPenStyle" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxPenStyle_SelectionChanged">
-                                                                    <ComboBoxItem Content="基于点集" FontFamily="Microsoft YaHei UI"/>
-                                                                    <ComboBoxItem Content="基于速率" FontFamily="Microsoft YaHei UI"/>
-                                                                    <ComboBoxItem Content="无笔锋" FontFamily="Microsoft YaHei UI"/>
-                                                                </ComboBox>
+                                    <Border x:Name="PenPalette" Visibility="Visible" Background="white" Opacity="0.9" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1" CornerRadius="8" Margin="-160,-192,-33,32">
+                                        <ui:SimpleStackPanel>
+                                            <Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1" CornerRadius="8,8,0,0" Background="#2563eb" Margin="-1,-1,-1,0" Padding="1,1,1,0">
+                                                <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
+                                                    <TextBlock Text="笔选项" Foreground="White" Padding="8,5,44,5" FontSize="11" FontWeight="Bold" TextAlignment="Center"/>
+                                                </ui:SimpleStackPanel>
+                                            </Border>
+                                            <Viewbox Margin="12,8,12,0" HorizontalAlignment="Center" VerticalAlignment="Center" Stretch="Fill" >
+                                                <ui:SimpleStackPanel>
+                                                    <Controls:UniformGrid Columns="2" Width="300" Height="55">
+                                                        <ui:SimpleStackPanel Orientation="Horizontal" Height="35">
+                                                            <Label Content="笔锋" Margin="0,0,6,0" Foreground="{DynamicResource FloatBarForeground}" FontSize="16" FontWeight="Bold" VerticalAlignment="Center"/>
+                                                            <ComboBox Height="30" VerticalAlignment="Center" Name="ComboBoxPenStyle" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxPenStyle_SelectionChanged">
+                                                                <ComboBoxItem Content="基于点集" FontFamily="Microsoft YaHei UI"/>
+                                                                <ComboBoxItem Content="基于速率" FontFamily="Microsoft YaHei UI"/>
+                                                                <ComboBoxItem Content="关闭笔锋" FontFamily="Microsoft YaHei UI"/>
+                                                            </ComboBox>
+                                                        </ui:SimpleStackPanel>
+                                                        <ui:SimpleStackPanel Margin="0,-5,0,-5" VerticalAlignment="Center">
+                                                            <ui:SimpleStackPanel x:Name="NibModeSimpleStackPanel" Orientation="Horizontal" Width="140">
+                                                                <Label Content="笔尖模式" FontSize="15" VerticalAlignment="Center"/>
+                                                                <ui:ToggleSwitch x:Name="ToggleSwitchEnableNibMode" MinWidth="0" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" Margin="10,0,0,0" Toggled="ToggleSwitchEnableNibMode_Toggled" IsOn="True"/>
                                                             </ui:SimpleStackPanel>
-                                                            <ui:SimpleStackPanel Margin="0,-5,0,-5" VerticalAlignment="Center">
-                                                                <ui:SimpleStackPanel x:Name="NibModeSimpleStackPanel" Orientation="Horizontal" Width="140">
-                                                                    <Label Content="笔尖模式" FontSize="15" VerticalAlignment="Center"/>
-                                                                    <ui:ToggleSwitch x:Name="ToggleSwitchEnableNibMode" MinWidth="0" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" Margin="10,0,0,0" Toggled="ToggleSwitchEnableNibMode_Toggled" IsOn="True"/>
-                                                                </ui:SimpleStackPanel>
-                                                                <ui:SimpleStackPanel Orientation="Horizontal" Width="140">
-                                                                    <Label Margin="0,0,10,0" Content="墨迹纠正" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
-                                                                    <ui:ToggleSwitch Foreground="{DynamicResource FloatBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关"
-                                                                                     Toggled="ToggleSwitchEnableInkToShape_Toggled" MinWidth="0" IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}"/>
-                                                                </ui:SimpleStackPanel>
+                                                            <ui:SimpleStackPanel Orientation="Horizontal" Width="140">
+                                                                <Label Margin="0,0,10,0" Content="墨迹纠正" Foreground="{DynamicResource FloatBarForeground}" FontSize="15" VerticalAlignment="Center"/>
+                                                                <ui:ToggleSwitch Foreground="{DynamicResource FloatBarForeground}" FontFamily="Microsoft YaHei UI" Width="70" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableInkToShape_Toggled" MinWidth="0" IsOn="{Binding ElementName=ToggleSwitchEnableInkToShape, Path=IsOn}"/>
                                                             </ui:SimpleStackPanel>
-                                                        </Controls:UniformGrid>
+                                                        </ui:SimpleStackPanel>
+                                                    </Controls:UniformGrid>
 
 
-                                                        <StackPanel Orientation="Horizontal" Height="30">
-                                                            <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold" Foreground="{DynamicResource FloatBarForeground}" FontSize="17" VerticalAlignment="Center"/>
-                                                            <Slider x:Name="InkWidthSlider" Minimum="1" Maximum="15" Width="208" FontFamily="Microsoft YaHei UI"
-                                                                    FontSize="20" IsSnapToTickEnabled="True" Value="5" TickFrequency="0.1" TickPlacement="None" ValueChanged="InkWidthSlider_ValueChanged"/>
-                                                            <TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}" FontFamily="Consolas" VerticalAlignment="Bottom" Margin="10,0,0,4.5" FontSize="15"/>
-                                                        </StackPanel>
-                                                        <StackPanel Orientation="Horizontal" Height="30">
-                                                            <Label Margin="0,0,10,0" Content="透明" FontWeight="Bold" Foreground="{DynamicResource FloatBarForeground}" FontSize="17" VerticalAlignment="Center"/>
-                                                            <Slider x:Name="InkAlphaSlider" Minimum="1" Maximum="255" Width="208" FontFamily="Microsoft YaHei UI" FontSize="20" IsSnapToTickEnabled="True" Value="255" TickFrequency="1" TickPlacement="None" ValueChanged="InkAlphaSlider_ValueChanged"/>
-                                                            <TextBlock Text="{Binding Value, ElementName=InkAlphaSlider, Mode=OneWay}" FontFamily="Consolas" VerticalAlignment="Bottom" Margin="10,0,0,4.5" FontSize="15"/>
-                                                        </StackPanel>
-                                                    </ui:SimpleStackPanel>
-                                                </Viewbox>
-                                                <ui:SimpleStackPanel Width="300" Margin="0,8,0,0">
+                                                    <StackPanel Orientation="Horizontal" Height="30">
+                                                        <Label Margin="0,0,10,0" Content="粗细" FontWeight="Bold" Foreground="{DynamicResource FloatBarForeground}" FontSize="17" VerticalAlignment="Center"/>
+                                                        <Slider x:Name="InkWidthSlider" Minimum="1" Maximum="20" Width="208" FontFamily="Microsoft YaHei UI" FontSize="20" IsSnapToTickEnabled="True" Value="5" TickFrequency="0.1" TickPlacement="None" ValueChanged="InkWidthSlider_ValueChanged"/>
+                                                        <TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}" FontFamily="Consolas" VerticalAlignment="Bottom" Margin="10,0,0,4.5" FontSize="15"/>
+                                                    </StackPanel>
+                                                    <StackPanel Orientation="Horizontal" Height="30">
+                                                        <Label Margin="0,0,10,0" Content="透明" FontWeight="Bold" Foreground="{DynamicResource FloatBarForeground}" FontSize="17" VerticalAlignment="Center"/>
+                                                        <Slider x:Name="InkAlphaSlider" Minimum="1" Maximum="255" Width="208" FontFamily="Microsoft YaHei UI" FontSize="20" IsSnapToTickEnabled="True" Value="255" TickFrequency="1" TickPlacement="None" ValueChanged="InkAlphaSlider_ValueChanged"/>
+                                                        <TextBlock Text="{Binding Value, ElementName=InkAlphaSlider, Mode=OneWay}" FontFamily="Consolas" VerticalAlignment="Bottom" Margin="10,0,0,4.5" FontSize="15"/>
+                                                    </StackPanel>
+                                                </ui:SimpleStackPanel>
+                                            </Viewbox>
+                                            <Viewbox Margin="0,8,0,0" Stretch="Fill">
+                                                <ui:SimpleStackPanel Width="300" Margin="0,0,0,0">
                                                     <!--<TextBlock FontSize="25">画笔颜色</TextBlock>-->
                                                     <Border Width="300" Height="100" BorderBrush="Black" BorderThickness="0" CornerRadius="5">
                                                         <Controls:UniformGrid Rows="2" Height="100">
                                                             <ui:SimpleStackPanel Height="45" Orientation="Horizontal" Width="270">
                                                                 <Controls:UniformGrid Columns="5" Width="270" Margin="0">
-                                                                    <Border BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseDown="Border_MouseDown" MouseUp="ColorThemeSwitch_MouseUp">
+                                                                    <Border BorderBrush="Black" BorderThickness="1" CornerRadius="100" Width="45" MouseDown="Border_MouseDown" MouseUp="ColorThemeSwitch_MouseUp">
                                                                         <Grid Margin="3">
-                                                                            <Image x:Name="ColorThemeSwitchIcon" Source="/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="24" Height="24"/>
-                                                                            <TextBlock x:Name="ColorThemeSwitchTextBlock" Text="亮系" Foreground="Black" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="10"/>
+                                                                            <Image x:Name="ColorThemeSwitchIcon" Source="/Resources/Icons-Fluent/ic_fluent_weather_sunny_24_regular.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="23" Height="23" Margin="0,0,0,0"/>
+                                                                            <TextBlock Margin="0,0,0,2" x:Name="ColorThemeSwitchTextBlock" Text="亮系" Foreground="Black" VerticalAlignment="Bottom" HorizontalAlignment="Center" FontSize="11"/>
                                                                         </Grid>
                                                                     </Border>
-                                                                    <Border x:Name="BorderPenColorBlack" Background="Black" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorBlack_Click">
-                                                                        <Viewbox Name="ViewboxBtnColorBlackContent" Visibility="Collapsed" Margin="6">
-                                                                            <ui:SymbolIcon Symbol="Accept" Foreground="White"/>
+                                                                    <Border x:Name="BorderPenColorBlack" Background="Black" BorderBrush="Black" BorderThickness="1.5" CornerRadius="100" Width="45" MouseUp="BtnColorBlack_Click">
+                                                                        <Viewbox Name="ViewboxBtnColorBlackContent" Visibility="Collapsed" Margin="8">
+                                                                            <Image Source="/Resources/new-icons/checked-white.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0"/>
                                                                         </Viewbox>
                                                                     </Border>
-                                                                    <Border x:Name="BorderPenColorWhite" Background="White" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorWhite_Click">
-                                                                        <Viewbox x:Name="ViewboxBtnColorWhiteContent" Visibility="Collapsed" Margin="6">
-                                                                            <ui:SymbolIcon Symbol="Accept" Foreground="Black"/>
+                                                                    <Border x:Name="BorderPenColorWhite" Background="White" BorderBrush="#71717a" BorderThickness="1.5" CornerRadius="100" Width="45" MouseUp="BtnColorWhite_Click">
+                                                                        <Viewbox x:Name="ViewboxBtnColorWhiteContent" Visibility="Collapsed" Margin="8">
+                                                                            <Image Source="/Resources/new-icons/checked-black.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0"/>
                                                                         </Viewbox>
                                                                     </Border>
-                                                                    <Border x:Name="BorderPenColorRed" Background="#dc2626" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorRed_Click">
-                                                                        <Viewbox Name="ViewboxBtnColorRedContent" Visibility="Collapsed" Margin="6">
-                                                                            <ui:SymbolIcon Symbol="Accept" Foreground="White"/>
+                                                                    <Border x:Name="BorderPenColorRed" Background="#dc2626" BorderBrush="#7f1d1d" BorderThickness="1.5" CornerRadius="100" Width="45" MouseUp="BtnColorRed_Click">
+                                                                        <Viewbox Name="ViewboxBtnColorRedContent" Visibility="Collapsed" Margin="8">
+                                                                            <Image Source="/Resources/new-icons/checked-white.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0"/>
                                                                         </Viewbox>
                                                                     </Border>
-                                                                    <Border x:Name="BorderPenColorYellow" Background="#eab308" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorYellow_Click">
-                                                                        <Viewbox x:Name="ViewboxBtnColorYellowContent" Visibility="Collapsed" Margin="6">
-                                                                            <ui:SymbolIcon Symbol="Accept" Foreground="White"/>
+                                                                    <Border x:Name="BorderPenColorYellow" Background="#eab308" BorderBrush="#713f12" BorderThickness="1.5" CornerRadius="100" Width="45" MouseUp="BtnColorYellow_Click">
+                                                                        <Viewbox x:Name="ViewboxBtnColorYellowContent" Visibility="Collapsed" Margin="8">
+                                                                            <Image Source="/Resources/new-icons/checked-white.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0"/>
                                                                         </Viewbox>
                                                                     </Border>
                                                                 </Controls:UniformGrid>
@@ -1475,27 +1477,27 @@
                                                             <ui:SimpleStackPanel Height="45" Orientation="Horizontal" Width="270">
                                                                 <Controls:UniformGrid Columns="5" Width="270" Margin="0">
 
-                                                                    <Border x:Name="BorderPenColorGreen" Background="#16a34a" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorGreen_Click">
-                                                                        <Viewbox Name="ViewboxBtnColorGreenContent" Visibility="Collapsed" Margin="6">
+                                                                    <Border x:Name="BorderPenColorGreen" Background="#16a34a" BorderBrush="#14532d" BorderThickness="1.5" CornerRadius="100" Width="45" MouseUp="BtnColorGreen_Click">
+                                                                        <Viewbox Name="ViewboxBtnColorGreenContent" Visibility="Collapsed" Margin="8">
                                                                             <ui:SymbolIcon Symbol="Accept" Foreground="White"/>
                                                                         </Viewbox>
                                                                     </Border>
-                                                                    <Border x:Name="BorderPenColorBlue" Background="#2563eb" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorBlue_Click">
-                                                                        <Viewbox x:Name="ViewboxBtnColorBlueContent" Visibility="Collapsed" Margin="6">
-                                                                            <ui:SymbolIcon Symbol="Accept" Foreground="White"/>
+                                                                    <Border x:Name="BorderPenColorBlue" Background="#2563eb" BorderBrush="#1e3a8a" BorderThickness="1.5" CornerRadius="100" Width="45" MouseUp="BtnColorBlue_Click">
+                                                                        <Viewbox x:Name="ViewboxBtnColorBlueContent" Visibility="Collapsed" Margin="8">
+                                                                            <Image Source="/Resources/new-icons/checked-white.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0"/>
                                                                         </Viewbox>
                                                                     </Border>
-                                                                    <Border x:Name="BorderPenColorPink" Background="#db2777" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorPink_Click">
-                                                                        <Viewbox x:Name="ViewboxBtnColorPinkContent" Visibility="Collapsed" Margin="6">
-                                                                            <ui:SymbolIcon Symbol="Accept" Foreground="White"/>
+                                                                    <Border x:Name="BorderPenColorPink" Background="#db2777" BorderBrush="#831843" BorderThickness="1.5" CornerRadius="100" Width="45" MouseUp="BtnColorPink_Click">
+                                                                        <Viewbox x:Name="ViewboxBtnColorPinkContent" Visibility="Collapsed" Margin="8">
+                                                                            <Image Source="/Resources/new-icons/checked-white.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0"/>
                                                                         </Viewbox>
                                                                     </Border>
-                                                                    <Border x:Name="BorderPenColorTeal" Background="#0d9488" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorTeal_Click">
-                                                                        <Viewbox x:Name="ViewboxBtnColorTealContent" Visibility="Collapsed" Margin="6">
-                                                                            <ui:SymbolIcon Symbol="Accept" Foreground="White"/>
+                                                                    <Border x:Name="BorderPenColorTeal" Background="#0d9488" BorderBrush="#134e4a" BorderThickness="1.5" CornerRadius="100" Width="45" MouseUp="BtnColorTeal_Click">
+                                                                        <Viewbox x:Name="ViewboxBtnColorTealContent" Visibility="Collapsed" Margin="8">
+                                                                            <Image Source="/Resources/new-icons/checked-white.png" RenderOptions.BitmapScalingMode="HighQuality" VerticalAlignment="Top" Width="24" Height="24" Margin="0,0,0,0"/>
                                                                         </Viewbox>
                                                                     </Border>
-                                                                    <Border x:Name="BorderPenColorOrange" Background="#ea580c" BorderBrush="Black" BorderThickness="1.5" CornerRadius="10" Width="45" MouseUp="BtnColorOrange_Click">
+                                                                    <Border x:Name="BorderPenColorOrange" Background="#ea580c" BorderBrush="#7c2d12" BorderThickness="1.5" CornerRadius="100" Width="45" MouseUp="BtnColorOrange_Click">
                                                                         <Viewbox x:Name="ViewboxBtnColorOrangeContent" Visibility="Collapsed" Margin="6">
                                                                             <ui:SymbolIcon Symbol="Accept" Foreground="White"/>
                                                                         </Viewbox>
@@ -1505,8 +1507,8 @@
                                                         </Controls:UniformGrid>
                                                     </Border>
                                                 </ui:SimpleStackPanel>
-                                            </StackPanel>
-                                        </Viewbox>
+                                            </Viewbox>
+                                        </ui:SimpleStackPanel>
                                     </Border>
                                 </Grid>
                             </ui:SimpleStackPanel>
@@ -1627,9 +1629,9 @@
                                 <TextBlock x:Name="HideToolbarTextBlock" Text="隐藏" Foreground="Black"  FontSize="8" Margin="0,1,0,0" TextAlignment="Center"/>
                             </ui:SimpleStackPanel>
                             <Grid Width="0">
-                                <Border ClipToBounds="True" Name="BorderTools" Margin="-133,-155,14,37" CornerRadius="5" Background="White" Opacity="0.9" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
+                                <Border ClipToBounds="True" Name="BorderTools" Margin="-133,-156,14,37" CornerRadius="5" Background="White" Opacity="0.9" BorderThickness="1" BorderBrush="{DynamicResource FloatBarBorderBrush}">
                                     <ui:SimpleStackPanel Margin="-1,0,0,0">
-                                        <Border CornerRadius="6,6,0,0" Background="#2563eb" Margin="-1,-1,-1,0" Padding="1,1,1,0">
+                                        <Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1" CornerRadius="6,6,0,0" Background="#2563eb" Margin="-1,-1,-1,0" Padding="1,1,1,0">
                                             <ui:SimpleStackPanel Orientation="Horizontal" HorizontalAlignment="Stretch">
                                                 <TextBlock Text="更多功能" Foreground="White" Padding="8,5,44,5" FontSize="11" FontWeight="Bold" TextAlignment="Center"/>
                                                 <Image Margin="0,0,0,0" Source="/Resources/new-icons/close-white.png" RenderOptions.BitmapScalingMode="HighQuality" Height="16" Width="16" MouseDown="Border_MouseDown" MouseUp="CloseBordertools_MouseUp"/>
@@ -1695,9 +1697,9 @@
                     </ui:SimpleStackPanel>
                 </Border>
                 <Grid Width="0">
-                    <Border ClipToBounds="True" Name="TwoFingerGestureBorder" Margin="-86,-110,-33,40" CornerRadius="5" Background="#fafafa" Opacity="1" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1">
+                    <Border ClipToBounds="True" Name="TwoFingerGestureBorder" Margin="-86,-111,-33,40" CornerRadius="5" Background="#fafafa" Opacity="1" BorderBrush="{DynamicResource FloatBarBorderBrush}" BorderThickness="1">
                         <ui:SimpleStackPanel Margin="0">
-                            <Border CornerRadius="6,6,0,0" Background="#2563eb" Margin="-1,-1,-1,1">
+                            <Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1" CornerRadius="6,6,0,0" Background="#2563eb" Margin="-1,-1,-1,1">
                                 <TextBlock Text="手势选项" Foreground="White" Padding="0,5" FontSize="11" FontWeight="Bold" TextAlignment="Center"/>
                             </Border>
                             <ui:SimpleStackPanel Orientation="Horizontal" Spacing="4" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="0,3,0,0">
diff --git a/Ink Canvas/Resources/new-icons/checked-black.png b/Ink Canvas/Resources/new-icons/checked-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..75d70cde6f7aa055d7fcf855d2fc6ad6c49097c9
GIT binary patch
literal 1845
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

literal 0
HcmV?d00001

diff --git a/Ink Canvas/Resources/new-icons/checked-white.png b/Ink Canvas/Resources/new-icons/checked-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..2485512a96f2686087d3f37e358ec5d499cf8f13
GIT binary patch
literal 1418
zcmV;51$Fv~P)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h00009a7bBm001mY
z001mY0i`{bsQ>@~0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH1s_R7K~#7F?VXKr
z+c*$~pKh)Ir-EZDxTFHh6~w9F(!nVeNU7j-6-24PP6eK;AWj9sRbY3p*$u#nqA20w
zhw>7{H-n*POo_x>VgW3c5YT8e8jVJy(P%X0#sY>Rq6<DOx%|Q91(z-q92|QdxwwPl
zJ(tgNTr3ukFp4Py1i?k<S6r^~qsXb;hw_n)af`<Hu<%PR@3}nC_&kJbEiq^0Y3H(`
z^N9X4_FVqLoG>E%F?%j6)DBnjI#kvwd#bTTaHTpfcQhStxOAuiuE>gPxf?BV&(m!U
z<bC~?rq4eZkx}LW<eTpe{FuH5WDfC~=MWBsDQ<uu{vFCqqO9P!T$MILQ3F&gevd<8
zBNQ{h48-qoC}@Nt2AGlfJr0G8P|5(GP)~=eMLOoI+(_$h$b`k;Vt(QaQs*@?$!Y;C
z{u@5L$GmyVtze5pk_{02zPO$X%o}k*FH`%292X=r#JP(vhz7}CAjts1^<1OTBMVAN
zdL+3ZzSth~8FFfI@UAFoR21C;$S+)UXdKgV`5Tc$w}1+tetBYd@Z);<dx`Xf0Qvm$
z(Xuea_fuVbBA<zITu%w5?<kF^xj|G5pt_#^!I>=ASHdex#PP`A`AmDVx(^_q#?he;
zv|)sIi06VLQeI*@;aV1}V`4b>NJFia+6A#yA29uiS9AbPoI2uBcgCs~Kz@=jNAWwP
z(Wh7rqIE&9Fl|yp$2qfom1ZgzMAMG<Cy7t_!A8f|d_Hv2paH@-`2o`;NBj~ie9wli
zt#LtfeDX^zuU-zFpfSLom>w3yhvs`~Yynop7Y4P{7@$KLc3hT=0Q?kxhq71_A4R?|
z1gvsd|Kj`CRECp*HAVd-b9+zYutzSGpV>UPTu1pvuqeJz!~nUd`VdMtf>rUqf?Oz*
z$ZM@B4%6Zb$b~XNB&0WjdGQ70LisEa2@M-z65<QUrN9j*<;>8}jW8MU$%pXsD0I^+
zBtSnJVM^kEy<g-)<=$>gT2Z5KMwpuT!rjpQ{jR8kLm75_L*QBJhnNrX`S191GPC_)
zXojoB4V|DdK<c{aDN>E_FCsA@zA&hrCKmKR$|6P>b%EcA_`;w8o^nCvO>9fhU`Tu+
ze?caEfkSzUw*+J2t2T<#F3R6x9EusinD~OK@6;OLBgP}!2nNL$R1d8-D?<7K39XKq
z8<f;17!_ZgAF65r!IzEYhI*n~f>H4WwN^2?p~XimCr}%~u=v7Gdtz*Q`nmE$f9Z~l
zi?2$^>WO_tX^Zn9En#!&ALPT^mbXRN#GD-40?yGHA0k7!9sCBY9lq@+YL%#`Ur2dJ
zOfnocXq;jd8@Ea^fIR&Y=kCxrB>L$WqF+-DL(;cs9J4_JNiS*(l=cE!t=#g1`5Fnd
z%{uaVn$0@G1ykN4tc}$oW9O`_4V%I~Ip>-iSY(^KrjhJ|dcvqk`U6!8Vns;2|0OcX
z-m)x=ilhT_m=6xV&e>$QfF9%VnUXkI+qSZ221anOx^Zhy#YS)#Ve8`TKH!*egI6e<
zPxRFEuRb{xrnmtFxzR8}s9}gIbr?nbvp{~6r>XvcL-ZD8CLy07dqdOVj%xV{lS9b2
zhCSJ3Pl?-4P73nBE3+p%h`U)+Li+opp{H*V^A!FV7T}W3|5JvSFhKE%SS~C~zwrJ7
z<pO*TK3Pi2=Y)-$M#G!|4hgP7c5CU4(ZMeO^~Xcp!BNV6IR0lz@J6H2Xfzs)Mx)XA
Y0yRRtAM7cKAOHXW07*qoM6N<$f@jf|T>t<8

literal 0
HcmV?d00001