From 30bc0b03e5f5c0978654002be9a17dbdd1eeaa2a Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sun, 22 Feb 2026 13:28:35 +0800
Subject: [PATCH] improve:UI

---
 Ink Canvas/Windows/DlassSettingsWindow.xaml | 64 +++++++++++----------
 1 file changed, 34 insertions(+), 30 deletions(-)

diff --git a/Ink Canvas/Windows/DlassSettingsWindow.xaml b/Ink Canvas/Windows/DlassSettingsWindow.xaml
index 30be8f9a..df6fca37 100644
--- a/Ink Canvas/Windows/DlassSettingsWindow.xaml	
+++ b/Ink Canvas/Windows/DlassSettingsWindow.xaml	
@@ -34,10 +34,12 @@
             CornerRadius="15"
             Margin="10"
             x:Name="MainBorder"
+            ClipToBounds="True"
             MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
         <Grid>
             <controls:WinUI3CloseButton x:Name="BtnClose" 
                                         HorizontalAlignment="Right" VerticalAlignment="Top" 
+                                        Width="46" Height="32"
                                         Margin="0,0,0,0" Cursor="Hand" Click="BtnClose_Click"
                                         Content="✕"/>
             
@@ -48,40 +50,42 @@
                     <RowDefinition Height="*"/>
                 </Grid.RowDefinitions>
                 
-                <!-- 标题栏 -->
-                <Grid Grid.Row="0" 
-                      Height="50" 
-                      Background="{StaticResource WindowBackground}" 
-                      x:Name="TitleBar" 
-                      VerticalAlignment="Top" 
-                      MouseLeftButtonDown="TitleBar_MouseLeftButtonDown"
-                      Margin="0,0,46,0">
-                    <StackPanel Orientation="Horizontal" 
-                                HorizontalAlignment="Left" 
-                                VerticalAlignment="Center" 
-                                Margin="22,0,0,0">
-                        <!-- 设置图标 -->
-                        <Path Data="M12 15.5A3.5 3.5 0 0 1 8.5 12A3.5 3.5 0 0 1 12 8.5A3.5 3.5 0 0 1 15.5 12A3.5 3.5 0 0 1 12 15.5M19.43 12.97C19.47 12.65 19.5 12.33 19.5 12C19.5 11.67 19.47 11.34 19.43 11.03L21.54 9.37C21.73 9.22 21.78 8.95 21.66 8.73L19.66 5.27C19.54 5.05 19.27 4.96 19.05 5.05L16.56 6.05C16.04 5.65 15.5 5.32 14.87 5.07L14.5 2.42C14.46 2.18 14.25 2 14 2H10C9.75 2 9.54 2.18 9.5 2.42L9.13 5.07C8.5 5.32 7.96 5.66 7.44 6.05L4.95 5.05C4.73 4.96 4.46 5.05 4.35 5.27L2.35 8.73C2.23 8.95 2.27 9.22 2.46 9.37L4.57 11.03C4.53 11.34 4.5 11.67 4.5 12C4.5 12.33 4.53 12.65 4.57 12.97L2.46 14.63C2.27 14.78 2.23 15.05 2.35 15.27L4.35 18.73C4.46 18.95 4.73 19.03 4.95 18.95L7.44 17.95C7.96 18.34 8.5 18.68 9.13 18.93L9.5 21.58C9.54 21.82 9.75 22 10 22H14C14.25 22 14.46 21.82 14.5 21.58L14.87 18.93C15.5 18.67 16.04 18.34 16.56 17.95L19.05 18.95C19.27 19.03 19.54 18.95 19.66 18.73L21.66 15.27C21.78 15.05 21.73 14.78 21.54 14.63L19.43 12.97Z" 
-                              Stroke="{StaticResource TitleForeground}" 
-                              StrokeThickness="1.5" 
-                              StrokeLineJoin="Round" 
-                              Fill="Transparent" 
-                              Width="24" Height="24" 
-                              Stretch="Uniform" 
-                              Margin="0,0,8,0"/>
-                        <!-- 标题文字 -->
-                        <TextBlock Text="Dlass设置管理" 
-                                   FontSize="28" 
-                                   FontWeight="Bold" 
-                                   Foreground="{StaticResource TitleForeground}" 
-                                   x:Name="TitleText"/>
-                    </StackPanel>
-                </Grid>
+                <!-- 标题栏 --> 
+                <Border Grid.Row="0" 
+                        Height="50" 
+                        Background="{StaticResource WindowBackground}" 
+                        CornerRadius="15,15,0,0"
+                        Margin="0,0,46,0"
+                        MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
+                    <Grid x:Name="TitleBar" VerticalAlignment="Stretch">
+                        <StackPanel Orientation="Horizontal" 
+                                    HorizontalAlignment="Left" 
+                                    VerticalAlignment="Center" 
+                                    Margin="22,0,0,0">
+                            <!-- 设置图标 -->
+                            <Path Data="M12 15.5A3.5 3.5 0 0 1 8.5 12A3.5 3.5 0 0 1 12 8.5A3.5 3.5 0 0 1 15.5 12A3.5 3.5 0 0 1 12 15.5M19.43 12.97C19.47 12.65 19.5 12.33 19.5 12C19.5 11.67 19.47 11.34 19.43 11.03L21.54 9.37C21.73 9.22 21.78 8.95 21.66 8.73L19.66 5.27C19.54 5.05 19.27 4.96 19.05 5.05L16.56 6.05C16.04 5.65 15.5 5.32 14.87 5.07L14.5 2.42C14.46 2.18 14.25 2 14 2H10C9.75 2 9.54 2.18 9.5 2.42L9.13 5.07C8.5 5.32 7.96 5.66 7.44 6.05L4.95 5.05C4.73 4.96 4.46 5.05 4.35 5.27L2.35 8.73C2.23 8.95 2.27 9.22 2.46 9.37L4.57 11.03C4.53 11.34 4.5 11.67 4.5 12C4.5 12.33 4.53 12.65 4.57 12.97L2.46 14.63C2.27 14.78 2.23 15.05 2.35 15.27L4.35 18.73C4.46 18.95 4.73 19.03 4.95 18.95L7.44 17.95C7.96 18.34 8.5 18.68 9.13 18.93L9.5 21.58C9.54 21.82 9.75 22 10 22H14C14.25 22 14.46 21.82 14.5 21.58L14.87 18.93C15.5 18.67 16.04 18.34 16.56 17.95L19.05 18.95C19.27 19.03 19.54 18.95 19.66 18.73L21.66 15.27C21.78 15.05 21.73 14.78 21.54 14.63L19.43 12.97Z" 
+                                  Stroke="{StaticResource TitleForeground}" 
+                                  StrokeThickness="1.5" 
+                                  StrokeLineJoin="Round" 
+                                  Fill="Transparent" 
+                                  Width="24" Height="24" 
+                                  Stretch="Uniform" 
+                                  Margin="0,0,8,0"/>
+                            <!-- 标题文字 -->
+                            <TextBlock Text="Dlass设置管理" 
+                                       FontSize="28" 
+                                       FontWeight="Bold" 
+                                       Foreground="{StaticResource TitleForeground}" 
+                                       x:Name="TitleText"/>
+                        </StackPanel>
+                    </Grid>
+                </Border>
                 
                 <!-- 主内容区 -->
                 <Border Grid.Row="1" 
                         Background="{StaticResource WindowBackground}" 
-                        Padding="20,10,20,20">
+                        Padding="20,10,20,20"
+                        CornerRadius="0,0,15,15">
                     <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
                         <ui:SimpleStackPanel Spacing="16">
                             <!-- 内容区域 -->