From dada05aabbadb99b1fafa0bef284787f291dce1b Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Sat, 2 May 2026 00:56:58 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=B5=AE=E5=8A=A8=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E6=A0=8F):=20=E6=B7=BB=E5=8A=A0=E9=80=80=E5=87=BA=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=B9=B6=E4=BC=98=E5=8C=96UI=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在浮动工具栏中添加退出按钮的本地化文本
- 移除未使用的BoardMenuFrame相关动画代码
- 调整浮动工具栏中元素的边距和圆角样式
- 将退出按钮文本改为使用i18n资源
---
 Ink Canvas/Helpers/AnimationsHelper.cs   |  6 ------
 Ink Canvas/MainWindow.xaml               | 10 +++++-----
 Ink Canvas/Properties/Strings.en-US.resx |  3 +++
 Ink Canvas/Properties/Strings.resx       |  3 +++
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Ink Canvas/Helpers/AnimationsHelper.cs b/Ink Canvas/Helpers/AnimationsHelper.cs
index 076bd4fd..00e8ba46 100644
--- a/Ink Canvas/Helpers/AnimationsHelper.cs	
+++ b/Ink Canvas/Helpers/AnimationsHelper.cs	
@@ -1,4 +1,3 @@
-using Ink_Canvas.Controls;
 using System;
 using System.Windows;
 using System.Windows.Media;
@@ -10,11 +9,6 @@ namespace Ink_Canvas.Helpers
     {
         private static UIElement ResolveAnimationTarget(UIElement element)
         {
-            if (element is BoardMenuFrame frame)
-            {
-                frame.ApplyTemplate();
-                return frame.AnimationTarget ?? element;
-            }
             return element;
         }
 
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 02aa2dac..5d706602 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -2460,7 +2460,7 @@
                             <Image Margin="0"
                                    Name="FloatingbarHeadIconImg"
                                    SnapsToDevicePixels="True"
-                                   RenderOptions.BitmapScalingMode="Fant"
+                                   RenderOptions.BitmapScalingMode="HighQuality"
                                    Source="/Resources/Icons-png/icc.png" />
                         </ikw:SimpleStackPanel>
                     </Border>
@@ -3116,7 +3116,7 @@
                     </Border>
 
                     <ikw:SimpleStackPanel Orientation="{Binding ElementName=StackPanelFloatingBar, Path=Orientation}">
-                        <Border Margin=" 4,0,0,0" x:Name="EnableTwoFingerGestureBorder" Visibility="Visible" Width="36"
+                        <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
@@ -3261,9 +3261,9 @@
                         </Canvas>
                     </ikw:SimpleStackPanel>
                     <!--Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}">-->
-                    <Border x:Name="BorderFloatingBarExitPPTBtn" Margin="2,0,0,0" Width="34" Height="36"
+                    <Border x:Name="BorderFloatingBarExitPPTBtn" Margin="2,0,0,0" Width="36" Height="36"
                             MouseDown="Border_MouseDown" MouseUp="ImagePPTControlEnd_MouseUp"
-                            Background="{DynamicResource FloatBarBackground}" CornerRadius="4" BorderThickness="1"
+                            Background="{DynamicResource FloatBarBackground}" CornerRadius="5" BorderThickness="1"
                             BorderBrush="{DynamicResource FloatBarBorderBrush}"
                             Visibility="{Binding ElementName=BtnPPTSlideShowEnd, Path=Visibility}">
                         <ikw:SimpleStackPanel Background="Transparent" Orientation="Vertical"
@@ -3272,7 +3272,7 @@
                             <Image Source="{DynamicResource QuickPanelEndSlideshowIcon}"
                                    RenderOptions.BitmapScalingMode="HighQuality" Width="28" Height="17"
                                    Margin="0,3,0,0" />
-                            <TextBlock Text="退出" Foreground="{DynamicResource FloatBarForeground}" FontSize="8" Margin="0,1,0,0"
+                            <TextBlock Text="{i18n:I18n Key=FloatingBar_ExitButton}" Foreground="{DynamicResource FloatBarForeground}" FontSize="8" Margin="0,1,0,0"
                                        TextAlignment="Center" />
                         </ikw:SimpleStackPanel>
                     </Border>
diff --git a/Ink Canvas/Properties/Strings.en-US.resx b/Ink Canvas/Properties/Strings.en-US.resx
index 8e6cd975..41553132 100644
--- a/Ink Canvas/Properties/Strings.en-US.resx	
+++ b/Ink Canvas/Properties/Strings.en-US.resx	
@@ -2175,6 +2175,9 @@ Hide</value>
   <data name="FloatingBar_GestureButton" xml:space="preserve">
     <value>Gesture</value>
   </data>
+  <data name="FloatingBar_ExitButton" xml:space="preserve">
+    <value>Exit</value>
+  </data>
   <data name="FloatingBar_GesturePanelTitle" xml:space="preserve">
     <value>Gesture options</value>
   </data>
diff --git a/Ink Canvas/Properties/Strings.resx b/Ink Canvas/Properties/Strings.resx
index 594af26d..ccbfe3e1 100644
--- a/Ink Canvas/Properties/Strings.resx	
+++ b/Ink Canvas/Properties/Strings.resx	
@@ -2218,6 +2218,9 @@
   <data name="FloatingBar_GestureButton" xml:space="preserve">
     <value>手势</value>
   </data>
+  <data name="FloatingBar_ExitButton" xml:space="preserve">
+    <value>退出</value>
+  </data>
   <data name="FloatingBar_GesturePanelTitle" xml:space="preserve">
     <value>手势选项</value>
   </data>