From 220a316d704f09e4f4517f33b9d03ee2fde6449f Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Sat, 11 Apr 2026 22:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=93=E7=BC=A9=E6=89=8D=E6=98=AF=E7=B2=BE?=
 =?UTF-8?q?=E5=8D=8E=EF=BC=88=EF=BC=9F=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml | 93 ++++++++------------------------------
 1 file changed, 20 insertions(+), 73 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index ed62b2db..af1be64f 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -7351,16 +7351,8 @@
                             </Canvas>
                             <ikw:SimpleStackPanel Margin="2,0" Name="StackPanelFloatingBar" Orientation="Horizontal" Cursor="Arrow" HorizontalAlignment="Left">
                                 <!--<ikw:SimpleStackPanel Name="Cursor_Icon" MouseDown="Border_MouseDown" MouseUp="CursorIcon_Click"-->
-                                <controls:ToolbarImageButton x:Name="Cursor_Icon"
-                                                             ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                             ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                             ButtonMouseUp="CursorIcon_Click"
-                                                             Label="{i18n:I18n Key=FloatingBar_Mouse}" />
-                                <controls:ToolbarImageButton x:Name="Pen_Icon"
-                                                             ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                             ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                             ButtonMouseUp="PenIcon_Click"
-                                                             Label="{i18n:I18n Key=FloatingBar_Annotate}" />
+                                <controls:ToolbarImageButton x:Name="Cursor_Icon" ButtonMouseUp="CursorIcon_Click" Label="{i18n:I18n Key=FloatingBar_Mouse}" />
+                                <controls:ToolbarImageButton x:Name="Pen_Icon" ButtonMouseUp="PenIcon_Click" Label="{i18n:I18n Key=FloatingBar_Annotate}" />
                                 
                                 <!-- 快捷调色盘 - 双行显示模式 -->
                                 <ikw:SimpleStackPanel Name="QuickColorPalettePanel" 
@@ -7935,12 +7927,7 @@
                                     </Border>
                                 </ikw:SimpleStackPanel>
                                 
-                                <controls:ToolbarImageButton x:Name="SymbolIconDelete"
-                                                             ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                             ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                             ButtonMouseUp="SymbolIconDelete_MouseUp"
-                                                             IconBrush="{DynamicResource RedBrush}"
-                                                             Label="{i18n:I18n Key=FloatingBar_Clear}" />
+                                <controls:ToolbarImageButton x:Name="SymbolIconDelete" ButtonMouseUp="SymbolIconDelete_MouseUp" IconBrush="{DynamicResource RedBrush}" Label="{i18n:I18n Key=FloatingBar_Clear}" />
                                 <ikw:SimpleStackPanel Name="StackPanelCanvasControls" Visibility="Visible"
                                                      Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
                                     <ikw:SimpleStackPanel Width="0"
@@ -8746,26 +8733,10 @@
                                         </Grid>
                                     </ikw:SimpleStackPanel>
 
-                                    <controls:ToolbarImageButton x:Name="Eraser_Icon"
-                                                         ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                         ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                         ButtonMouseUp="EraserIcon_Click"
-                                                         Label="{i18n:I18n Key=FloatingBar_AreaEraser}" />
-                                    <controls:ToolbarImageButton x:Name="EraserByStrokes_Icon"
-                                                         ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                         ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                         ButtonMouseUp="EraserIconByStrokes_Click"
-                                                         Label="{i18n:I18n Key=FloatingBar_StrokeEraser}" />
-                                    <controls:ToolbarImageButton x:Name="SymbolIconSelect"
-                                                         ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                         ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                         ButtonMouseUp="SymbolIconSelect_MouseUp"
-                                                         Label="{i18n:I18n Key=FloatingBar_LassoSelect}" />
-                                    <controls:ToolbarImageButton x:Name="ShapeDrawFloatingBarBtn"
-                                                         ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                         ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                         ButtonMouseUp="ImageDrawShape_MouseUp"
-                                                         Label="{i18n:I18n Key=FloatingBar_Geometry}" />
+                                    <controls:ToolbarImageButton x:Name="Eraser_Icon" ButtonMouseUp="EraserIcon_Click" Label="{i18n:I18n Key=FloatingBar_AreaEraser}" />
+                                    <controls:ToolbarImageButton x:Name="EraserByStrokes_Icon" ButtonMouseUp="EraserIconByStrokes_Click" Label="{i18n:I18n Key=FloatingBar_StrokeEraser}" />
+                                    <controls:ToolbarImageButton x:Name="SymbolIconSelect" ButtonMouseUp="SymbolIconSelect_MouseUp" Label="{i18n:I18n Key=FloatingBar_LassoSelect}" />
+                                    <controls:ToolbarImageButton x:Name="ShapeDrawFloatingBarBtn" ButtonMouseUp="ImageDrawShape_MouseUp" Label="{i18n:I18n Key=FloatingBar_Geometry}" />
 
                                     <Grid Width="0">
                                         <Border x:Name="BorderDrawShape" Background="{DynamicResource FloatBarBackground}" Opacity="1"
@@ -9013,23 +8984,9 @@
                                             </ikw:SimpleStackPanel>
                                         </Border>
                                     </Grid>
-                                    <controls:ToolbarImageButton x:Name="SymbolIconUndo"
-                                                         ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                         ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                         ButtonMouseUp="SymbolIconUndo_MouseUp"
-                                                         Label="{i18n:I18n Key=Board_Undo}"
-                                                         IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}" />
-                                    <controls:ToolbarImageButton x:Name="SymbolIconRedo"
-                                                         ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                         ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                         ButtonMouseUp="SymbolIconRedo_MouseUp"
-                                                         Label="{i18n:I18n Key=Board_Redo}"
-                                                         IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}" />
-                                    <controls:ToolbarImageButton x:Name="CursorWithDelFloatingBarBtn"
-                                                         ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                         ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                         ButtonMouseUp="CursorWithDelIcon_Click"
-                                                         Label="{i18n:I18n Key=FloatingBar_ClearAndMouse}" />
+                                    <controls:ToolbarImageButton x:Name="SymbolIconUndo" ButtonMouseUp="SymbolIconUndo_MouseUp" Label="{i18n:I18n Key=Board_Undo}" IsEnabled="{Binding ElementName=BtnUndo, Path=IsEnabled}" />
+                                    <controls:ToolbarImageButton x:Name="SymbolIconRedo" ButtonMouseUp="SymbolIconRedo_MouseUp" Label="{i18n:I18n Key=Board_Redo}" IsEnabled="{Binding ElementName=BtnRedo, Path=IsEnabled}" />
+                                    <controls:ToolbarImageButton x:Name="CursorWithDelFloatingBarBtn" ButtonMouseUp="CursorWithDelIcon_Click" Label="{i18n:I18n Key=FloatingBar_ClearAndMouse}" />
                                 </ikw:SimpleStackPanel>
                                 <Grid Width="0">
                                     <Grid x:Name="BackgroundPaletteGrid" Margin="-203,-128,83,37">
@@ -9170,21 +9127,9 @@
                                 <ikw:SimpleStackPanel
                                     Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
                                     <Border Margin="2,0,2,0" BorderBrush="#71717a" BorderThickness="1,0,0,0" />
-                                    <controls:ToolbarImageButton x:Name="WhiteboardFloatingBarBtn"
-                                                         ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                         ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                         ButtonMouseUp="ImageBlackboard_MouseUp"
-                                                         Label="{i18n:I18n Key=FloatingBar_Whiteboard}" />
-                                    <controls:ToolbarImageButton x:Name="ToolsFloatingBarBtn"
-                                                         ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                         ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                         ButtonMouseUp="SymbolIconTools_MouseUp"
-                                                         Label="{i18n:I18n Key=Board_Tools}" />
-                                    <controls:ToolbarImageButton x:Name="Fold_Icon"
-                                                                 ButtonMouseDown="FloatingBarToolBtnMouseDownFeedback_Panel"
-                                                                 ButtonMouseLeave="FloatingBarToolBtnMouseLeaveFeedback_Panel"
-                                                                 ButtonMouseUp="FoldFloatingBar_MouseUp"
-                                                                 Label="{i18n:I18n Key=FloatingBar_Hide}" />
+                                    <controls:ToolbarImageButton x:Name="WhiteboardFloatingBarBtn" ButtonMouseUp="ImageBlackboard_MouseUp" Label="{i18n:I18n Key=FloatingBar_Whiteboard}" />
+                                    <controls:ToolbarImageButton x:Name="ToolsFloatingBarBtn" ButtonMouseUp="SymbolIconTools_MouseUp" Label="{i18n:I18n Key=Board_Tools}" />
+                                    <controls:ToolbarImageButton x:Name="Fold_Icon" ButtonMouseUp="FoldFloatingBar_MouseUp" Label="{i18n:I18n Key=FloatingBar_Hide}" />
                                     <Grid Width="0">
                                         <Border ClipToBounds="True" Name="BorderTools" Margin="-103,-156,-16,37"
                                                 CornerRadius="5" Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderThickness="1"
@@ -9410,8 +9355,8 @@
 
                     </Border>
 
-
-                    <Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36"
+                    <ikw:SimpleStackPanel Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
+                        <Border Margin="2,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36"
                             Height="36" CornerRadius="5" Background="{DynamicResource FloatBarBackground}" BorderBrush="{DynamicResource FloatBarBorderBrush}"
                             BorderThickness="1">
                         <ikw:SimpleStackPanel
@@ -9426,8 +9371,9 @@
                                        TextAlignment="Center" />
                         </ikw:SimpleStackPanel>
                     </Border>
-                    <Grid Width="0">
-                        <Border ClipToBounds="True" Name="TwoFingerGestureBorder" Margin="-86,-111,-33,40"
+                    <Canvas Width="0">
+                        <Border ClipToBounds="True" Name="TwoFingerGestureBorder" Visibility="Collapsed"
+                                Canvas.Left="-86" Canvas.Top="-111"
                                 CornerRadius="5"
                                 Background="{DynamicResource FloatBarBackground}" Opacity="1" BorderBrush="#2563eb"
                                 BorderThickness="1">
@@ -9553,7 +9499,8 @@
                                 </ikw:SimpleStackPanel>
                             </ikw:SimpleStackPanel>
                         </Border>
-                    </Grid>
+                    </Canvas>
+                    </ikw:SimpleStackPanel>
                     <!--Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}">-->
                     <Border x:Name="BorderFloatingBarExitPPTBtn" Margin="2,0,0,0" Width="34" Height="36"
                             MouseDown="Border_MouseDown" MouseUp="ImagePPTControlEnd_MouseUp"