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

---
 Ink Canvas/Windows/SeewoStyleTimerWindow.xaml    | 6 +++---
 Ink Canvas/Windows/SeewoStyleTimerWindow.xaml.cs | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml b/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml
index 97581bf4..a5cdfee6 100644
--- a/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml	
+++ b/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml	
@@ -10,7 +10,7 @@
         Loaded="Window_Loaded" Closing="Window_Closing" WindowStartupLocation="CenterScreen"
         Title="Ink Canvas 画板 - 计时器" Height="450" Width="900">
 
-    <Border Background="{DynamicResource SeewoTimerWindowBackground}" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource SeewoTimerWindowBorderBrush}" Margin="10" x:Name="MainBorder">
+    <Border Background="{DynamicResource SeewoTimerWindowBackground}" CornerRadius="15" BorderThickness="1" BorderBrush="{DynamicResource SeewoTimerWindowBorderBrush}" Margin="10" x:Name="MainBorder" MouseLeftButtonDown="WindowDragMove">
         <Grid>
             <!-- 主要内容区域 -->
             <Grid>
@@ -18,11 +18,11 @@
                 <Viewbox x:Name="MainViewController" Margin="20,20,20,20">
                     <Grid Height="400" Width="900">
                         <!-- 顶部标题栏 -->
-                        <Grid Height="50" Background="{DynamicResource SeewoTimerWindowBackground}" x:Name="TitleBar" HorizontalAlignment="Stretch" VerticalAlignment="Top">
+                        <Grid Height="50" Background="{DynamicResource SeewoTimerWindowBackground}" x:Name="TitleBar" HorizontalAlignment="Stretch" VerticalAlignment="Top" MouseLeftButtonDown="WindowDragMove">
                             <TextBlock Text="计时" FontSize="20" FontWeight="Bold" 
                                        HorizontalAlignment="Left" VerticalAlignment="Center" 
                                        Margin="22,0,0,0" Foreground="{DynamicResource SeewoTimerWindowTitleForeground}" x:Name="TitleText"/>
-                            <Border x:Name="BtnClose" MouseUp="BtnClose_MouseUp" 
+                            <Border x:Name="BtnClose" MouseLeftButtonDown="BtnClose_MouseLeftButtonDown" 
                                     HorizontalAlignment="Right" VerticalAlignment="Center"
                                     Margin="0,0,22,0" Background="{DynamicResource SeewoTimerWindowButtonBackground}" Height="30" Width="30" 
                                     CornerRadius="15" Cursor="Hand">
diff --git a/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml.cs b/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml.cs
index f8e05b1e..002fee81 100644
--- a/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml.cs	
+++ b/Ink Canvas/Windows/SeewoStyleTimerWindow.xaml.cs	
@@ -542,8 +542,9 @@ namespace Ink_Canvas
             }
         }
 
-        private void BtnClose_MouseUp(object sender, MouseButtonEventArgs e)
+        private void BtnClose_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
         {
+            e.Handled = true;
             Close();
         }