From b7f7025d97402be1bae5ec41989633d164aa7df5 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Mon, 6 Oct 2025 17:00:27 +0800
Subject: [PATCH] =?UTF-8?q?improve:=E8=AE=A1=E6=97=B6=E5=99=A8UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Windows/SeewoStyleTimerWindow.xaml | 108 +++++++++++++++---
 1 file changed, 90 insertions(+), 18 deletions(-)

diff --git a/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml b/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml
index cc5420f4..ea13bbb2 100644
--- a/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml	
+++ b/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml	
@@ -385,8 +385,8 @@
                                     Margin="580,0,0,0"/>
 
                             <!-- 右侧：快捷选项区域 -->
-                            <Grid HorizontalAlignment="Right" VerticalAlignment="Center" 
-                                  x:Name="QuickOptionsGrid" Width="350" Margin="30,0,0,0">
+                            <Grid HorizontalAlignment="Left" VerticalAlignment="Center" 
+                                  x:Name="QuickOptionsGrid" Width="350" Margin="550,0,0,0" Height="177">
                                 <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
                                     <!-- Tab切换区域 -->
                                     <Grid Margin="0,0,0,20">
@@ -417,7 +417,7 @@
                                             </Button>
                                         </StackPanel>
                                     </Grid>
-                                    
+
                                     <!-- 常用计时区域 -->
                                     <Grid x:Name="CommonTimersGrid" Visibility="Visible">
                                         <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
@@ -432,8 +432,20 @@
                                                             </Border>
                                                         </ControlTemplate>
                                                     </Button.Template>
-                                                    <TextBlock Text="05:00" FontSize="12" FontWeight="Bold" 
-                                                               Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                        <Path Data="M10 15h2a1.5 1.5 0 0 0 0 -3h-2v-3h3.5 M3 12v.01 M21 12v.01 M12 21v.01 M7.5 4.2v.01 M16.5 19.8v.01 M7.5 19.8v.01 M4.2 16.5v.01 M19.8 16.5v.01 M19.8 7.5v.01 M4.2 7.5v.01 M16.5 4.206a9.042 9.042 0 0 0 -4.5 -1.206" 
+                                                              Stroke="{DynamicResource SeewoTimerWindowButtonForeground}" 
+                                                              StrokeThickness="1.5" 
+                                                              StrokeStartLineCap="Round" 
+                                                              StrokeEndLineCap="Round"
+                                                              StrokeLineJoin="Round" 
+                                                              Fill="Transparent" 
+                                                              Width="12" Height="12" 
+                                                              Stretch="Uniform" 
+                                                              Margin="0,0,4,0"/>
+                                                        <TextBlock Text="05:00" FontSize="12" FontWeight="Bold" 
+                                                                   Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    </StackPanel>
                                                 </Button>
                                                 <Button x:Name="Common10MinBtn" Width="70" Height="40" Background="{DynamicResource SeewoTimerWindowButtonBackground}" 
                                                 BorderThickness="0" Click="Common10Min_Click" Cursor="Hand" Margin="0,0,8,0">
@@ -444,8 +456,20 @@
                                                             </Border>
                                                         </ControlTemplate>
                                                     </Button.Template>
-                                                    <TextBlock Text="10:00" FontSize="12" FontWeight="Bold" 
-                                                               Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                        <Path Data="M9 9v6 M12 11v2a2 2 0 1 0 4 0v-2a2 2 0 1 0 -4 0z M3 12v.01 M21 12v.01 M12 21v.01 M7.5 4.2v.01 M16.5 19.8v.01 M7.5 19.8v.01 M4.2 16.5v.01 M19.8 16.5v.01 M4.2 7.5v.01 M19.81 7.527a8.994 8.994 0 0 0 -7.81 -4.527" 
+                                                              Stroke="{DynamicResource SeewoTimerWindowButtonForeground}" 
+                                                              StrokeThickness="1.5" 
+                                                              StrokeStartLineCap="Round" 
+                                                              StrokeEndLineCap="Round"
+                                                              StrokeLineJoin="Round" 
+                                                              Fill="Transparent" 
+                                                              Width="12" Height="12" 
+                                                              Stretch="Uniform" 
+                                                              Margin="0,0,4,0"/>
+                                                        <TextBlock Text="10:00" FontSize="12" FontWeight="Bold" 
+                                                                   Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    </StackPanel>
                                                 </Button>
                                                 <Button x:Name="Common15MinBtn" Width="70" Height="40" Background="{DynamicResource SeewoTimerWindowButtonBackground}" 
                                                 BorderThickness="0" Click="Common15Min_Click" Cursor="Hand">
@@ -456,11 +480,23 @@
                                                             </Border>
                                                         </ControlTemplate>
                                                     </Button.Template>
-                                                    <TextBlock Text="15:00" FontSize="12" FontWeight="Bold" 
-                                                               Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                        <Path Data="M12 15h2a1 1 0 0 0 1 -1v-1a1 1 0 0 0 -1 -1h-2v-3h3 M9 9v6 M3 12v.01 M12 21v.01 M7.5 4.2v.01 M16.5 19.8v.01 M7.5 19.8v.01 M4.2 16.5v.01 M19.8 16.5v.01 M4.2 7.5v.01 M21 12a9 9 0 0 0 -9 -9" 
+                                                              Stroke="{DynamicResource SeewoTimerWindowButtonForeground}" 
+                                                              StrokeThickness="1.5" 
+                                                              StrokeStartLineCap="Round" 
+                                                              StrokeEndLineCap="Round"
+                                                              StrokeLineJoin="Round" 
+                                                              Fill="Transparent" 
+                                                              Width="12" Height="12" 
+                                                              Stretch="Uniform" 
+                                                              Margin="0,0,4,0"/>
+                                                        <TextBlock Text="15:00" FontSize="12" FontWeight="Bold" 
+                                                                   Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    </StackPanel>
                                                 </Button>
                                             </StackPanel>
-                                            
+
                                             <!-- 第二排：30分钟, 45分钟, 60分钟 -->
                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                                 <Button x:Name="Common30MinBtn" Width="70" Height="40" Background="{DynamicResource SeewoTimerWindowButtonBackground}" 
@@ -472,8 +508,20 @@
                                                             </Border>
                                                         </ControlTemplate>
                                                     </Button.Template>
-                                                    <TextBlock Text="30:00" FontSize="12" FontWeight="Bold" 
-                                                               Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                        <Path Data="M14 10.5v3a1.5 1.5 0 0 0 3 0v-3a1.5 1.5 0 0 0 -3 0z M8 9h1.5a1.5 1.5 0 0 1 0 3h-.5h.5a1.5 1.5 0 0 1 0 3h-1.5 M3 12v.01 M7.5 4.2v.01 M7.5 19.8v.01 M4.2 16.5v.01 M4.2 7.5v.01 M12 21a9 9 0 0 0 0 -18" 
+                                                              Stroke="{DynamicResource SeewoTimerWindowButtonForeground}" 
+                                                              StrokeThickness="1.5" 
+                                                              StrokeStartLineCap="Round" 
+                                                              StrokeEndLineCap="Round"
+                                                              StrokeLineJoin="Round" 
+                                                              Fill="Transparent" 
+                                                              Width="12" Height="12" 
+                                                              Stretch="Uniform" 
+                                                              Margin="0,0,4,0"/>
+                                                        <TextBlock Text="30:00" FontSize="12" FontWeight="Bold" 
+                                                                   Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    </StackPanel>
                                                 </Button>
                                                 <Button x:Name="Common45MinBtn" Width="70" Height="40" Background="{DynamicResource SeewoTimerWindowButtonBackground}" 
                                                 BorderThickness="0" Click="Common45Min_Click" Cursor="Hand" Margin="0,0,8,0">
@@ -484,8 +532,20 @@
                                                             </Border>
                                                         </ControlTemplate>
                                                     </Button.Template>
-                                                    <TextBlock Text="45:00" FontSize="12" FontWeight="Bold" 
-                                                               Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                        <Path Data="M13 15h2a1 1 0 0 0 1 -1v-1a1 1 0 0 0 -1 -1h-2v-3h3 M7 9v2a1 1 0 0 0 1 1h1 M10 9v6 M7.5 4.2v.01 M4.2 7.5v.01 M3 12a9 9 0 1 0 9 -9" 
+                                                              Stroke="{DynamicResource SeewoTimerWindowButtonForeground}" 
+                                                              StrokeThickness="1.5" 
+                                                              StrokeStartLineCap="Round" 
+                                                              StrokeEndLineCap="Round"
+                                                              StrokeLineJoin="Round" 
+                                                              Fill="Transparent" 
+                                                              Width="12" Height="12" 
+                                                              Stretch="Uniform" 
+                                                              Margin="0,0,4,0"/>
+                                                        <TextBlock Text="45:00" FontSize="12" FontWeight="Bold" 
+                                                                   Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    </StackPanel>
                                                 </Button>
                                                 <Button x:Name="Common60MinBtn" Width="70" Height="40" Background="{DynamicResource SeewoTimerWindowButtonBackground}" 
                                                 BorderThickness="0" Click="Common60Min_Click" Cursor="Hand">
@@ -496,13 +556,25 @@
                                                             </Border>
                                                         </ControlTemplate>
                                                     </Button.Template>
-                                                    <TextBlock Text="60:00" FontSize="12" FontWeight="Bold" 
-                                                               Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
+                                                        <Path Data="M14 10.5v3a1.5 1.5 0 0 0 3 0v-3a1.5 1.5 0 0 0 -3 0z M11 9h-2a1 1 0 0 0 -1 1v4a1 1 0 0 0 1 1h1a1 1 0 0 0 1 -1v-1a1 1 0 0 0 -1 -1h-2 M3 12a9 9 0 1 0 18 0a9 9 0 0 0 -18 0" 
+                                                              Stroke="{DynamicResource SeewoTimerWindowButtonForeground}" 
+                                                              StrokeThickness="1.5" 
+                                                              StrokeStartLineCap="Round" 
+                                                              StrokeEndLineCap="Round"
+                                                              StrokeLineJoin="Round" 
+                                                              Fill="Transparent" 
+                                                              Width="12" Height="12" 
+                                                              Stretch="Uniform" 
+                                                              Margin="0,0,4,0"/>
+                                                        <TextBlock Text="60:00" FontSize="12" FontWeight="Bold" 
+                                                                   Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
+                                                    </StackPanel>
                                                 </Button>
                                             </StackPanel>
                                         </StackPanel>
                                     </Grid>
-                                    
+
                                     <!-- 最近计时区域 -->
                                     <Grid x:Name="RecentTimersGrid" Visibility="Collapsed">
                                         <StackPanel Orientation="Vertical" HorizontalAlignment="Center">
@@ -545,7 +617,7 @@
                                                                Foreground="{DynamicResource SeewoTimerWindowButtonForeground}"/>
                                                 </Button>
                                             </StackPanel>
-                                            
+
                                             <!-- 第二排：最近3个 -->
                                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
                                                 <Button x:Name="RecentTimer4Btn" Width="70" Height="40" Background="{DynamicResource SeewoTimerWindowButtonBackground}"