From 4a66c5371f0856372fe864d307874d7b2ff971c5 Mon Sep 17 00:00:00 2001
From: clover_yan <i@cyan.ml>
Date: Sat, 1 Jun 2024 19:25:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8A=8A=E7=94=BB=E7=AC=94=E7=B2=97?=
 =?UTF-8?q?=E7=BB=86=E8=B0=83=E8=8A=82=E6=A0=8F=E7=A7=BB=E5=88=B0=E6=89=B3?=
 =?UTF-8?q?=E6=89=8B=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 95f7ffc9..ec798100 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -392,19 +392,6 @@
                         </GroupBox>
                         <GroupBox Header="画板">
                             <ui:SimpleStackPanel Spacing="12">
-                                <StackPanel Orientation="Horizontal">
-                                    <Slider x:Name="InkWidthSlider"
-                                            HorizontalAlignment="Left"
-                                            Minimum="1" Maximum="20"
-                                            Width="330" FontFamily="Microsoft YaHei UI" 
-                                            ui:ControlHelper.Header="画笔粗细"
-                                            IsSnapToTickEnabled="True" Value="5"
-                                            TickFrequency="1" TickPlacement="Both"
-                                            ValueChanged="InkWidthSlider_ValueChanged"/>
-                                    <TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
-                                               VerticalAlignment="Bottom" Margin="10,0,0,8"
-                                               FontSize="14"/>
-                                </StackPanel>
                                 <ui:ToggleSwitch Name="ToggleSwitchShowCursor" Header="显示画笔光标" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowCursor_Toggled"/>
                                 <TextBlock Text="画笔样式" FontFamily="Microsoft YaHei UI" FontSize="14"/>
                                 <ComboBox Name="ComboBoxPenStyle" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxPenStyle_SelectionChanged">
@@ -1196,10 +1183,27 @@
                                 <ui:SymbolIcon Margin="0,0,0,0" Symbol="Camera" Foreground="{DynamicResource ToolBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconScreenshot_MouseUp"/>
                                 <Grid Height="24" Width="20">
                                     <ui:SymbolIcon Symbol="Repair" Foreground="{DynamicResource ToolBarForeground}" MouseDown="Border_MouseDown" MouseUp="SymbolIconTools_MouseUp"/>
-                                    <Border Name="BorderTools" Margin="37,-157,-140,-6" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
+                                    <Border Name="BorderTools" Margin="37,-195,-140,-6" CornerRadius="5" Background="{DynamicResource ToolBarBackground}" BorderThickness="1" BorderBrush="{DynamicResource ToolBarBorderBrush}">
                                         <ui:SimpleStackPanel>
                                             <Label Content="快捷设置" FontSize="14" Foreground="{DynamicResource ToolBarForeground}"
                                                    HorizontalAlignment="Left" Margin="8,8"/>
+                                            <Viewbox Margin="12,0,0,0" Height="38" Width="100" HorizontalAlignment="Left" VerticalAlignment="Top">
+                                                <ui:SimpleStackPanel>
+                                                    <Label Margin="0,0,0,-2" Content="画笔粗细" Foreground="{DynamicResource ToolBarForeground}" FontSize="13" VerticalAlignment="Center"/>
+                                                    <StackPanel Orientation="Horizontal">
+                                                        <Slider x:Name="InkWidthSlider"
+                                                                HorizontalAlignment="Left"
+                                                                Minimum="1" Maximum="20"
+                                                                Width="100"
+                                                                IsSnapToTickEnabled="True" Value="5"
+                                                                TickFrequency="1" TickPlacement="Both"
+                                                                ValueChanged="InkWidthSlider_ValueChanged"/>
+                                                        <TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
+                                                                   VerticalAlignment="Bottom" Margin="10,0,0,8"
+                                                                   Width="15" FontSize="13"/>
+                                                    </StackPanel>
+                                                </ui:SimpleStackPanel>
+                                            </Viewbox>
                                             <Viewbox Margin="12,0,0,0" Height="32" Width="50" HorizontalAlignment="Left" VerticalAlignment="Top">
                                                 <ui:SimpleStackPanel>
                                                     <Label Margin="0,0,0,-2" Content="墨迹识别" Foreground="{DynamicResource ToolBarForeground}" FontSize="13" VerticalAlignment="Center"/>

From 7924d183ab450c67bff999b05da0e6caba06a013 Mon Sep 17 00:00:00 2001
From: clover_yan <i@cyan.ml>
Date: Sat, 1 Jun 2024 20:23:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=9D=A2=E6=9D=BF?=
 =?UTF-8?q?=E9=87=8C=E9=9D=A2=E7=95=99=E4=B8=80=E4=B8=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow.xaml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index 2df35680..4cedea78 100644
--- a/Ink Canvas/MainWindow.xaml	
+++ b/Ink Canvas/MainWindow.xaml	
@@ -392,6 +392,19 @@
                         </GroupBox>
                         <GroupBox Header="画板">
                             <ui:SimpleStackPanel Spacing="12">
+                                <StackPanel Orientation="Horizontal">
+                                    <Slider x:Name="InkWidthSlider" 
+                                            HorizontalAlignment="Left"
+                                            Minimum="1" Maximum="20"
+                                            Width="330" FontFamily="Microsoft YaHei UI" 
+                                            ui:ControlHelper.Header="画笔粗细"
+                                            IsSnapToTickEnabled="True" Value="5"
+                                            TickFrequency="1" TickPlacement="Both"
+                                            ValueChanged="InkWidthSlider_ValueChanged"/>
+                                    <TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
+                                               VerticalAlignment="Bottom" Margin="10,0,0,8"
+                                               FontSize="14"/>
+                                </StackPanel>
                                 <ui:ToggleSwitch Name="ToggleSwitchShowCursor" Header="显示画笔光标" IsOn="False" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchShowCursor_Toggled"/>
                                 <TextBlock Text="画笔样式" FontFamily="Microsoft YaHei UI" FontSize="14"/>
                                 <ComboBox Name="ComboBoxPenStyle" FontFamily="Microsoft YaHei UI" SelectedIndex="0" SelectionChanged="ComboBoxPenStyle_SelectionChanged">
@@ -1191,13 +1204,11 @@
                                                 <ui:SimpleStackPanel>
                                                     <Label Margin="0,0,0,-2" Content="画笔粗细" Foreground="{DynamicResource ToolBarForeground}" FontSize="13" VerticalAlignment="Center"/>
                                                     <StackPanel Orientation="Horizontal">
-                                                        <Slider x:Name="InkWidthSlider"
-                                                                HorizontalAlignment="Left"
+                                                        <Slider HorizontalAlignment="Left"
                                                                 Minimum="1" Maximum="20"
                                                                 Width="100"
-                                                                IsSnapToTickEnabled="True" Value="5"
-                                                                TickFrequency="1" TickPlacement="Both"
-                                                                ValueChanged="InkWidthSlider_ValueChanged"/>
+                                                                IsSnapToTickEnabled="True" Value="{Binding ElementName=InkWidthSlider, Path=Value, Mode=TwoWay}"
+                                                                TickFrequency="1" TickPlacement="Both"/>
                                                         <TextBlock Text="{Binding Value, ElementName=InkWidthSlider, Mode=OneWay}"
                                                                    VerticalAlignment="Bottom" Margin="10,0,0,8"
                                                                    Width="15" FontSize="13"/>