From 0d419c1323e6b5cabf8ed4dbcbd3a7f3e751162d Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Thu, 31 Jul 2025 14:52:44 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BA=8C=E7=BA=A7=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E7=A7=BB=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 47296b51..2293e9a7 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -4993,10 +4993,8 @@
                                         </Border>
                                     </Border>
                                     <Border x:Name="BoardInsertImage" Width="60" Height="50" MouseDown="Border_MouseDown"
-                                            MouseUp="InsertImageOptions_MouseUp" BorderThickness="0,1,0,1"
-                                            BorderBrush="#a1a1aa"
-                                            Background="#f4f4f5"
-                                            Opacity="0.95">
+                                            BorderThickness="0,1,0,1" BorderBrush="#a1a1aa"
+                                            MouseUp="InsertImageOptions_MouseUp" Background="#f4f4f5" Opacity="0.95">
                                         <Grid Margin="6,6,6,4">
                                             <Image VerticalAlignment="Top"
                                                    RenderOptions.BitmapScalingMode="HighQuality" Height="20" Width="20">
@@ -5015,6 +5013,96 @@
                                                        HorizontalAlignment="Center" FontSize="12" />
                                         </Grid>
                                     </Border>
+
+
+
+                                    <!-- Image Insertion Options Panel -->
+                                    <Border ClipToBounds="True" Name="BoardImageOptionsPanel" Visibility="Collapsed"
+                                                    Margin="-80,-90,-14,33.5"
+                                                    CornerRadius="5" Background="#fafafa" Opacity="1"
+                                                    BorderThickness="1"
+                                                    BorderBrush="#2563eb">
+                                        <ui:SimpleStackPanel Margin="0">
+                                            <Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1"
+                                                            CornerRadius="5,5,0,0" Background="#2563eb"
+                                                            Padding="8,4">
+                                                <ui:SimpleStackPanel Orientation="Horizontal"
+                                                                             HorizontalAlignment="Stretch">
+                                                    <TextBlock Text="插入图片" Foreground="White"
+                                                                       FontSize="10" FontWeight="Bold"
+                                                                       VerticalAlignment="Center" />
+                                                    <Image Margin="8,0,0,0"
+                                                                   Source="/Resources/new-icons/close-white.png"
+                                                                   RenderOptions.BitmapScalingMode="HighQuality"
+                                                                   Height="12" Width="12"
+                                                                   MouseDown="Border_MouseDown"
+                                                                   MouseUp="CloseImageOptionsPanel_MouseUp" />
+                                                </ui:SimpleStackPanel>
+                                            </Border>
+                                            <ui:SimpleStackPanel Margin="6,4,6,4" Spacing="2">
+                                                <!-- Screenshot Option -->
+                                                <Border MouseDown="Border_MouseDown" MouseUp="ImageOptionScreenshot_MouseUp"
+                                                                Background="Transparent" CornerRadius="3" Padding="6,4">
+                                                    <Border.Style>
+                                                        <Style TargetType="Border">
+                                                            <Setter Property="Background" Value="Transparent"/>
+                                                            <Style.Triggers>
+                                                                <Trigger Property="IsMouseOver" Value="True">
+                                                                    <Setter Property="Background" Value="#f0f9ff"/>
+                                                                </Trigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Border.Style>
+                                                    <ui:SimpleStackPanel Orientation="Horizontal" Spacing="6">
+                                                        <Image Height="16" Width="16">
+                                                            <Image.Source>
+                                                                <DrawingImage>
+                                                                    <DrawingImage.Drawing>
+                                                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                                                            <GeometryDrawing Brush="#2563eb"
+                                                                                        Geometry="F0 M24,24z M0,0z M9,3C8.46957,3 7.96086,3.21071 7.58579,3.58579 7.21071,3.96086 7,4.46957 7,5 7,5.26522 6.89464,5.51957 6.70711,5.70711 6.51957,5.89464 6.26522,6 6,6L5,6C4.20435,6 3.44129,6.31607 2.87868,6.87868 2.31607,7.44129 2,8.20435 2,9L2,18C2,18.7956 2.31607,19.5587 2.87868,20.1213 3.44129,20.6839 4.20435,21 5,21L19,21C19.7957,21 20.5587,20.6839 21.1213,20.1213 21.6839,19.5587 22,18.7957 22,18L22,9C22,8.20435 21.6839,7.44129 21.1213,6.87868 20.5587,6.31607 19.7957,6 19,6L18,6C17.7348,6 17.4804,5.89464 17.2929,5.70711 17.1054,5.51957 17,5.26522 17,5 17,4.46957 16.7893,3.96086 16.4142,3.58579 16.0391,3.21071 15.5304,3 15,3L9,3z M9,5L15,5C15,5.79565 15.3161,6.55871 15.8787,7.12132 16.4413,7.68393 17.2044,8 18,8L19,8C19.2652,8 19.5196,8.10536 19.7071,8.29289 19.8946,8.48043 20,8.73478 20,9L20,18C20,18.2652 19.8946,18.5196 19.7071,18.7071 19.5196,18.8946 19.2652,19 19,19L5,19C4.73478,19 4.48043,18.8946 4.29289,18.7071 4.10536,18.5196 4,18.2652 4,18L4,9C4,8.73478 4.10536,8.48043 4.29289,8.29289 4.48043,8.10536 4.73478,8 5,8L6,8C6.79565,8 7.55871,7.68393 8.12132,7.12132 8.68393,6.55871 9,5.79565 9,5z M12,9C10.9391,9 9.92172,9.42143 9.17157,10.1716 8.42143,10.9217 8,11.9391 8,13 8,14.0609 8.42143,15.0783 9.17157,15.8284 9.92172,16.5786 10.9391,17 12,17 13.0609,17 14.0783,16.5786 14.8284,15.8284 15.5786,15.0783 16,14.0609 16,13 16,11.9391 15.5786,10.9217 14.8284,10.1716 14.0783,9.42143 13.0609,9 12,9z M10.5858,11.5858C10.9609,11.2107 11.4696,11 12,11 12.5304,11 13.0391,11.2107 13.4142,11.5858 13.7893,11.9609 14,12.4696 14,13 14,13.5304 13.7893,14.0391 13.4142,14.4142 13.0391,14.7893 12.5304,15 12,15 11.4696,15 10.9609,14.7893 10.5858,14.4142 10.2107,14.0391 10,13.5304 10,13 10,12.4696 10.2107,11.9609 10.5858,11.5858z" />
+                                                                        </DrawingGroup>
+                                                                    </DrawingImage.Drawing>
+                                                                </DrawingImage>
+                                                            </Image.Source>
+                                                        </Image>
+                                                        <TextBlock Text="截图" FontSize="11" FontWeight="SemiBold"
+                                                                          Foreground="#1f2937" VerticalAlignment="Center"/>
+                                                    </ui:SimpleStackPanel>
+                                                </Border>
+                                                <!-- Select Image Option -->
+                                                <Border MouseDown="Border_MouseDown" MouseUp="ImageOptionSelectFile_MouseUp"
+                                                                Background="Transparent" CornerRadius="3" Padding="6,4">
+                                                    <Border.Style>
+                                                        <Style TargetType="Border">
+                                                            <Setter Property="Background" Value="Transparent"/>
+                                                            <Style.Triggers>
+                                                                <Trigger Property="IsMouseOver" Value="True">
+                                                                    <Setter Property="Background" Value="#f0f9ff"/>
+                                                                </Trigger>
+                                                            </Style.Triggers>
+                                                        </Style>
+                                                    </Border.Style>
+                                                    <ui:SimpleStackPanel Orientation="Horizontal" Spacing="6">
+                                                        <Image Height="16" Width="16">
+                                                            <Image.Source>
+                                                                <DrawingImage>
+                                                                    <DrawingImage.Drawing>
+                                                                        <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
+                                                                            <GeometryDrawing Brush="#2563eb"
+                                                                                        Geometry="F1 M24,24z M0,0z M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2-0.9 2-2V5C21,3.9 20.1,3 19,3zM19,19H5V5h14V19z M17,7c-1.1,0-2,0.9-2,2s0.9,2 2,2 2-0.9 2-2S18.1,7 17,7zM7,17l2.5-3.01 1.96,2.36 2.54-3.21L17,17H7z"/>
+                                                                        </DrawingGroup>
+                                                                    </DrawingImage.Drawing>
+                                                                </DrawingImage>
+                                                            </Image.Source>
+                                                        </Image>
+                                                        <TextBlock Text="选择图片" FontSize="11" FontWeight="SemiBold"
+                                                                          Foreground="#1f2937" VerticalAlignment="Center"/>
+                                                    </ui:SimpleStackPanel>
+                                                </Border>
+                                            </ui:SimpleStackPanel>
+                                        </ui:SimpleStackPanel>
+                                    </Border>
                                     <Border x:Name="BoardUndo" Width="60" Height="50" MouseDown="Border_MouseDown"
                                             MouseUp="SymbolIconUndo_MouseUp" BorderThickness="0,1,0,1"
                                             BorderBrush="#a1a1aa"
@@ -5104,7 +5192,7 @@
                                                 </TransformGroup>
                                             </Grid.RenderTransform>
                                             <Border ClipToBounds="True" Name="BoardBorderTools"
-                                                    Margin="-105,-138.5,-14,33.5"
+                                                    Margin="-80,-138.5,-39,33.5"
                                                     CornerRadius="5" Background="#fafafa" Opacity="1"
                                                     BorderThickness="1"
                                                     BorderBrush="#2563eb">
@@ -5321,93 +5409,6 @@
                                                     </ui:SimpleStackPanel>
                                                 </ui:SimpleStackPanel>
                                             </Border>
-                                            <!-- Image Insertion Options Panel -->
-                                            <Border ClipToBounds="True" Name="BoardImageOptionsPanel" Visibility="Collapsed"
-                                                    Margin="-80,-90,-14,33.5"
-                                                    CornerRadius="5" Background="#fafafa" Opacity="1"
-                                                    BorderThickness="1"
-                                                    BorderBrush="#2563eb">
-                                                <ui:SimpleStackPanel Margin="0">
-                                                    <Border BorderBrush="#1e3a8a" BorderThickness="0,0,0,1"
-                                                            CornerRadius="5,5,0,0" Background="#2563eb"
-                                                            Padding="8,4">
-                                                        <ui:SimpleStackPanel Orientation="Horizontal"
-                                                                             HorizontalAlignment="Stretch">
-                                                            <TextBlock Text="插入图片" Foreground="White"
-                                                                       FontSize="10" FontWeight="Bold"
-                                                                       VerticalAlignment="Center" />
-                                                            <Image Margin="8,0,0,0"
-                                                                   Source="/Resources/new-icons/close-white.png"
-                                                                   RenderOptions.BitmapScalingMode="HighQuality"
-                                                                   Height="12" Width="12"
-                                                                   MouseDown="Border_MouseDown"
-                                                                   MouseUp="CloseImageOptionsPanel_MouseUp" />
-                                                        </ui:SimpleStackPanel>
-                                                    </Border>
-                                                    <ui:SimpleStackPanel Margin="6,4,6,4" Spacing="2">
-                                                        <!-- Screenshot Option -->
-                                                        <Border MouseDown="Border_MouseDown" MouseUp="ImageOptionScreenshot_MouseUp"
-                                                                Background="Transparent" CornerRadius="3" Padding="6,4">
-                                                            <Border.Style>
-                                                                <Style TargetType="Border">
-                                                                    <Setter Property="Background" Value="Transparent"/>
-                                                                    <Style.Triggers>
-                                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                                            <Setter Property="Background" Value="#f0f9ff"/>
-                                                                        </Trigger>
-                                                                    </Style.Triggers>
-                                                                </Style>
-                                                            </Border.Style>
-                                                            <ui:SimpleStackPanel Orientation="Horizontal" Spacing="6">
-                                                                <Image Height="16" Width="16">
-                                                                    <Image.Source>
-                                                                        <DrawingImage>
-                                                                            <DrawingImage.Drawing>
-                                                                                <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                                                    <GeometryDrawing Brush="#2563eb"
-                                                                                        Geometry="F0 M24,24z M0,0z M9,3C8.46957,3 7.96086,3.21071 7.58579,3.58579 7.21071,3.96086 7,4.46957 7,5 7,5.26522 6.89464,5.51957 6.70711,5.70711 6.51957,5.89464 6.26522,6 6,6L5,6C4.20435,6 3.44129,6.31607 2.87868,6.87868 2.31607,7.44129 2,8.20435 2,9L2,18C2,18.7956 2.31607,19.5587 2.87868,20.1213 3.44129,20.6839 4.20435,21 5,21L19,21C19.7957,21 20.5587,20.6839 21.1213,20.1213 21.6839,19.5587 22,18.7957 22,18L22,9C22,8.20435 21.6839,7.44129 21.1213,6.87868 20.5587,6.31607 19.7957,6 19,6L18,6C17.7348,6 17.4804,5.89464 17.2929,5.70711 17.1054,5.51957 17,5.26522 17,5 17,4.46957 16.7893,3.96086 16.4142,3.58579 16.0391,3.21071 15.5304,3 15,3L9,3z M9,5L15,5C15,5.79565 15.3161,6.55871 15.8787,7.12132 16.4413,7.68393 17.2044,8 18,8L19,8C19.2652,8 19.5196,8.10536 19.7071,8.29289 19.8946,8.48043 20,8.73478 20,9L20,18C20,18.2652 19.8946,18.5196 19.7071,18.7071 19.5196,18.8946 19.2652,19 19,19L5,19C4.73478,19 4.48043,18.8946 4.29289,18.7071 4.10536,18.5196 4,18.2652 4,18L4,9C4,8.73478 4.10536,8.48043 4.29289,8.29289 4.48043,8.10536 4.73478,8 5,8L6,8C6.79565,8 7.55871,7.68393 8.12132,7.12132 8.68393,6.55871 9,5.79565 9,5z M12,9C10.9391,9 9.92172,9.42143 9.17157,10.1716 8.42143,10.9217 8,11.9391 8,13 8,14.0609 8.42143,15.0783 9.17157,15.8284 9.92172,16.5786 10.9391,17 12,17 13.0609,17 14.0783,16.5786 14.8284,15.8284 15.5786,15.0783 16,14.0609 16,13 16,11.9391 15.5786,10.9217 14.8284,10.1716 14.0783,9.42143 13.0609,9 12,9z M10.5858,11.5858C10.9609,11.2107 11.4696,11 12,11 12.5304,11 13.0391,11.2107 13.4142,11.5858 13.7893,11.9609 14,12.4696 14,13 14,13.5304 13.7893,14.0391 13.4142,14.4142 13.0391,14.7893 12.5304,15 12,15 11.4696,15 10.9609,14.7893 10.5858,14.4142 10.2107,14.0391 10,13.5304 10,13 10,12.4696 10.2107,11.9609 10.5858,11.5858z" />
-                                                                                </DrawingGroup>
-                                                                            </DrawingImage.Drawing>
-                                                                        </DrawingImage>
-                                                                    </Image.Source>
-                                                                </Image>
-                                                                <TextBlock Text="截图" FontSize="11" FontWeight="SemiBold"
-                                                                          Foreground="#1f2937" VerticalAlignment="Center"/>
-                                                            </ui:SimpleStackPanel>
-                                                        </Border>
-                                                        <!-- Select Image Option -->
-                                                        <Border MouseDown="Border_MouseDown" MouseUp="ImageOptionSelectFile_MouseUp"
-                                                                Background="Transparent" CornerRadius="3" Padding="6,4">
-                                                            <Border.Style>
-                                                                <Style TargetType="Border">
-                                                                    <Setter Property="Background" Value="Transparent"/>
-                                                                    <Style.Triggers>
-                                                                        <Trigger Property="IsMouseOver" Value="True">
-                                                                            <Setter Property="Background" Value="#f0f9ff"/>
-                                                                        </Trigger>
-                                                                    </Style.Triggers>
-                                                                </Style>
-                                                            </Border.Style>
-                                                            <ui:SimpleStackPanel Orientation="Horizontal" Spacing="6">
-                                                                <Image Height="16" Width="16">
-                                                                    <Image.Source>
-                                                                        <DrawingImage>
-                                                                            <DrawingImage.Drawing>
-                                                                                <DrawingGroup ClipGeometry="M0,0 V24 H24 V0 H0 Z">
-                                                                                    <GeometryDrawing Brush="#2563eb"
-                                                                                        Geometry="F1 M24,24z M0,0z M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2-0.9 2-2V5C21,3.9 20.1,3 19,3zM19,19H5V5h14V19z M17,7c-1.1,0-2,0.9-2,2s0.9,2 2,2 2-0.9 2-2S18.1,7 17,7zM7,17l2.5-3.01 1.96,2.36 2.54-3.21L17,17H7z"/>
-                                                                                </DrawingGroup>
-                                                                            </DrawingImage.Drawing>
-                                                                        </DrawingImage>
-                                                                    </Image.Source>
-                                                                </Image>
-                                                                <TextBlock Text="选择图片" FontSize="11" FontWeight="SemiBold"
-                                                                          Foreground="#1f2937" VerticalAlignment="Center"/>
-                                                            </ui:SimpleStackPanel>
-                                                        </Border>
-                                                    </ui:SimpleStackPanel>
-                                                </ui:SimpleStackPanel>
-                                            </Border>
                                         </Grid>
                                     </Border>
                                     <Border Width="60" Height="50" MouseDown="Border_MouseDown"
@@ -7565,7 +7566,7 @@
                                                    Margin="0,1,0,0" TextAlignment="Center" />
                                     </ui:SimpleStackPanel>
                                     <Grid Width="0">
-                                        <Border ClipToBounds="True" Name="BorderTools" Margin="-100,-156,-19,37"
+                                        <Border ClipToBounds="True" Name="BorderTools" Margin="-103,-156,-16,37"
                                                 CornerRadius="5" Background="#fafafa" Opacity="1" BorderThickness="1"
                                                 BorderBrush="#2563eb">
                                             <ui:SimpleStackPanel Margin="-1,0,0,0">