改了下标题栏

不会约定式提交
2026-03-22 14:35:19 +08:00
parent 8faffe9d4e
commit 9bc9af5eec
9 changed files with 1053 additions and 848 deletions
@@ -7,12 +7,14 @@
        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
        xmlns:controls="clr-namespace:Ink_Canvas.Windows.Controls"
        mc:Ignorable="d"
-        WindowStyle="None"
        Title="云存储管理" Height="600" Width="900"
        WindowStartupLocation="CenterScreen"
        ResizeMode="CanResize"
-        AllowsTransparency="True"
-        Background="Transparent">
+        ui:ThemeManager.IsThemeAware="True"
+        ui:TitleBar.ExtendViewIntoTitleBar="True"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:TitleBar.Height="48">
    
    <Window.Resources>
        <ResourceDictionary>
@@ -76,63 +78,40 @@
        </ResourceDictionary>
    </Window.Resources>
    
-    <Border Background="{StaticResource WindowBackground}" 
-            BorderBrush="{StaticResource BorderBrush}" 
-            BorderThickness="1"
-            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="✕"/>
-            
-            <!-- 主要内容区域 -->
    <Grid>
        <Grid.RowDefinitions>
            <RowDefinition Height="Auto"/>
            <RowDefinition Height="*"/>
        </Grid.RowDefinitions>
        
-                <!-- 标题栏 --> 
-                <Border Grid.Row="0" 
-                        Height="50" 
-                        Background="{StaticResource WindowBackground}" 
-                        CornerRadius="15,15,0,0"
-                        Margin="0,0,46,0">
-                    <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="云储存管理" 
-                                       FontSize="28" 
-                                       FontWeight="Bold" 
-                                       Foreground="{StaticResource TitleForeground}" 
-                                       x:Name="TitleText"/>
-                        </StackPanel>
+        <!-- 自定义标题栏 -->
+        <Border x:Name="Border_TitleBarRoot"
+                Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}" 
+                           VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
+
+                <!--Right Inset-->
+                <Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
+                    Grid.Column="2"/>
+
+                <!--Right Buttons-->
+                <ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
+                    Orientation="Horizontal" Grid.Column="1" Spacing="5">
+                </ikw:SimpleStackPanel>
            </Grid>
        </Border>
                
        <!-- 主内容区 -->
        <Border Grid.Row="1" 
                Background="{StaticResource WindowBackground}" 
-                        Padding="20,10,20,20"
-                        CornerRadius="0,0,15,15">
+                Padding="20,10,20,20">
            <TabControl Background="{StaticResource WindowBackground}" BorderThickness="0" SelectionChanged="TabControl_SelectionChanged">
                        <!-- 样式 -->
                        <TabControl.Resources>
@@ -911,7 +890,5 @@
            </TabControl>
        </Border>
    </Grid>
-        </Grid>
-    </Border>
 </Window>

@@ -7,14 +7,17 @@
        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
        xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
        mc:Ignorable="d"
-        ui:WindowHelper.UseModernWindowStyle="False"
-        ui:WindowHelper.SystemBackdropType="Mica"
        Title="历史版本回滚" Height="650" Width="900" ResizeMode="CanResize" 
-        WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" 
+        WindowStartupLocation="CenterScreen"
        Background="{DynamicResource SettingsPageBackground}" MinHeight="550" MinWidth="800"
        SnapsToDevicePixels="True"
        TextOptions.TextRenderingMode="ClearType"
-        TextOptions.TextFormattingMode="Display">
+        TextOptions.TextFormattingMode="Display"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:TitleBar.ExtendViewIntoTitleBar="True"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:TitleBar.Height="48">
    <Window.Resources>
        <!-- 主题相关颜色资源 -->
        <SolidColorBrush x:Key="PrimaryBrush" Color="#FF2563eb"/>
@@ -22,7 +25,38 @@
        <SolidColorBrush x:Key="TextSecondaryBrush" Color="#FF6b7280"/>
    </Window.Resources>
    
-    <Grid Background="Transparent" Margin="20">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        
+        <!-- 自定义标题栏 -->
+        <Border x:Name="Border_TitleBarRoot"
+                Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}" 
+                           VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
+
+                <!--Right Inset-->
+                <Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
+                    Grid.Column="2"/>
+
+                <!--Right Buttons-->
+                <ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
+                    Orientation="Horizontal" Grid.Column="1" Spacing="5">
+                </ikw:SimpleStackPanel>
+            </Grid>
+        </Border>
+        
+        <!-- 主内容区 -->
+        <Grid Grid.Row="1" Background="{DynamicResource SettingsPageBackground}" Margin="20,20,20,20">
            <Grid.RowDefinitions>
                <RowDefinition Height="Auto"/>
                <RowDefinition Height="Auto"/>
@@ -143,4 +177,5 @@
                </Border>
            </ikw:SimpleStackPanel>
        </Grid>
+    </Grid>
 </Window>
@@ -4,11 +4,18 @@
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:local="clr-namespace:Ink_Canvas"
-        mc:Ignorable="d" FontFamily="Microsoft YaHei UI" ui:WindowHelper.UseModernWindowStyle="True"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+        mc:Ignorable="d" FontFamily="Microsoft YaHei UI"
        WindowStartupLocation="CenterScreen"
-        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" Topmost="True"
+        Topmost="True"
        Title="Ink Canvas 抽奖 - 名单导入" Height="500" Width="400"
-        Loaded="Window_Loaded" Closing="Window_Closing">
+        Loaded="Window_Loaded" Closing="Window_Closing"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:TitleBar.ExtendViewIntoTitleBar="True"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:TitleBar.Height="48">
    <Window.Resources>
        <!-- 主题资源 -->
        <SolidColorBrush x:Key="NamesInputWindowBackground" Color="White"/>
@@ -17,7 +24,38 @@
        <SolidColorBrush x:Key="NamesInputWindowButtonForeground" Color="Black"/>
        <SolidColorBrush x:Key="NamesInputWindowBorderBrush" Color="#E4E4E7"/>
    </Window.Resources>
-    <Grid Background="{DynamicResource NamesInputWindowBackground}">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        
+        <!-- 自定义标题栏 -->
+        <Border x:Name="Border_TitleBarRoot"
+                Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}" 
+                           VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
+
+                <!--Right Inset-->
+                <Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
+                    Grid.Column="2"/>
+
+                <!--Right Buttons-->
+                <ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
+                    Orientation="Horizontal" Grid.Column="1" Spacing="5">
+                </ikw:SimpleStackPanel>
+            </Grid>
+        </Border>
+        
+        <!-- 主内容区 -->
+        <Grid Grid.Row="1" Background="{DynamicResource NamesInputWindowBackground}" Margin="10,10,10,10">
            <Label Content="请在下方输入名单，每行一人（建议直接粘贴表格姓名列）" 
                   Margin="10" 
                   Foreground="{DynamicResource NamesInputWindowForeground}"
@@ -41,4 +79,5 @@
                    Foreground="{DynamicResource NamesInputWindowButtonForeground}"
                    BorderBrush="{DynamicResource NamesInputWindowBorderBrush}"/>
        </Grid>
+    </Grid>
 </Window>
@@ -3,6 +3,8 @@
        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
        mc:Ignorable="d"
        Title="欢迎使用 InkCanvasForClass"
        Height="480"
@@ -17,7 +19,12 @@
        IsManipulationEnabled="True"
        TouchDown="Window_TouchDown"
        TouchMove="Window_TouchMove"
-        TouchUp="Window_TouchUp">
+        TouchUp="Window_TouchUp"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:TitleBar.ExtendViewIntoTitleBar="True"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:TitleBar.Height="48">

    <Window.Resources>
        <Style x:Key="OobeSecondaryButtonStyle" TargetType="Button">
@@ -51,7 +58,38 @@
        </Style>
    </Window.Resources>

-    <Grid Margin="24">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        
+        <!-- 自定义标题栏 -->
+        <Border x:Name="Border_TitleBarRoot"
+                Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}" 
+                           VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
+
+                <!--Right Inset-->
+                <Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
+                    Grid.Column="2"/>
+
+                <!--Right Buttons-->
+                <ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
+                    Orientation="Horizontal" Grid.Column="1" Spacing="5">
+                </ikw:SimpleStackPanel>
+            </Grid>
+        </Border>
+        
+        <!-- 主内容区 -->
+        <Grid Grid.Row="1" Margin="24,24,24,24" Background="{DynamicResource SettingsPageBackground}">
            <Grid.RowDefinitions>
                <RowDefinition Height="Auto" />
                <RowDefinition Height="*" />
@@ -559,5 +597,6 @@
                        Click="BtnConfirm_Click" />
            </Grid>
        </Grid>
+    </Grid>
 </Window>

@@ -4,14 +4,17 @@
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
        xmlns:local="clr-namespace:Ink_Canvas.Windows"
        mc:Ignorable="d"
-        WindowStyle="None"
        Title="插件管理" Height="550" Width="800"
        WindowStartupLocation="CenterScreen"
        ResizeMode="CanResize"
-        AllowsTransparency="True"
-        Background="#F9F9F9">
+        ui:ThemeManager.IsThemeAware="True"
+        ui:TitleBar.ExtendViewIntoTitleBar="True"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:TitleBar.Height="48">
    
    <Window.Resources>
        <!-- 定义必要的资源 -->
@@ -28,22 +31,40 @@
            <RowDefinition Height="Auto"/>
        </Grid.RowDefinitions>
        
-        <!-- 标题栏 -->
-        <Border Grid.Row="0" Background="{DynamicResource SystemAccentColorLight1}" Height="60" 
-                MouseLeftButtonDown="TitleBar_MouseLeftButtonDown">
+        <!-- 自定义标题栏 -->
+        <Border x:Name="Border_TitleBarRoot"
+                Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
            <Grid>
-                <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="20,0,0,0">
-                    <TextBlock Text="插件管理" FontSize="22" FontWeight="SemiBold" Foreground="White" VerticalAlignment="Center"/>
-                </StackPanel>
-                <Button x:Name="BtnClose" Content="&#xE8BB;" FontFamily="Segoe MDL2 Assets" 
-                        HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,0,20,0"
-                        Background="Transparent" BorderThickness="0" FontSize="16" Foreground="White"
-                        Click="BtnClose_Click"/>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}" 
+                           VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
+
+                <!--Right Inset-->
+                <Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
+                    Grid.Column="2"/>
+
+                <!--Right Buttons-->
+                <ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
+                    Orientation="Horizontal" Grid.Column="1" Spacing="5">
+
+
+                </ikw:SimpleStackPanel>
            </Grid>
        </Border>
        
+        <!-- 内容区域背景 -->
+        <Border Grid.Row="1" Grid.RowSpan="2"
+                Background="{DynamicResource SystemControlBackgroundAltHighBrush}"
+                BorderThickness="0,1,0,0"
+                BorderBrush="{DynamicResource SystemControlForegroundBaseLowBrush}"/>
+        
        <!-- 主内容区 -->
-        <Grid Grid.Row="1" Margin="20">
+        <Grid Grid.Row="1" Margin="20,20,20,20">
            <Grid.ColumnDefinitions>
                <ColumnDefinition Width="250"/>
                <ColumnDefinition Width="*"/>
@@ -140,7 +161,7 @@
        </Grid>
        
        <!-- 底部操作栏 -->
-        <Border Grid.Row="2" Background="{DynamicResource SystemControlBackgroundChromeMediumBrush}" Height="60">
+        <Border Grid.Row="2" Background="{DynamicResource SystemControlBackgroundAltHighBrush}" Height="60">
            <Grid>
                <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="20,0,0,0">
                    <Button x:Name="BtnLoadPlugin" Content="加载本地插件" Click="BtnLoadPlugin_Click"
@@ -519,6 +519,24 @@ namespace Ink_Canvas.Windows
            }
        }

+        /// <summary>
+        /// 刷新插件列表按钮点击事件
+        /// </summary>
+        private void Button_Refresh_Click(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                // 刷新插件列表
+                RefreshPluginList();
+                LogHelper.WriteLogToFile("用户点击刷新按钮，刷新插件列表");
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"刷新插件列表时出错: {ex.Message}", LogHelper.LogType.Error);
+                MessageBox.Show($"刷新插件列表时出错: {ex.Message}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
+            }
+        }
+
        /// <summary>
        /// 保存插件状态按钮点击事件
        /// </summary>
@@ -616,38 +634,7 @@ namespace Ink_Canvas.Windows
            }
        }

-        /// <summary>
-        /// 关闭按钮点击事件
-        /// </summary>
-        private void BtnClose_Click(object sender, RoutedEventArgs e)
-        {
-            // 直接关闭窗口，窗口关闭事件会处理配置保存
-            Close();
-        }

-        /// <summary>
-        /// 标题栏拖拽事件
-        /// </summary>
-        private void TitleBar_MouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
-        {
-            if (e.ClickCount == 2)
-            {
-                // 双击标题栏切换最大化状态
-                if (WindowState == WindowState.Maximized)
-                {
-                    WindowState = WindowState.Normal;
-                }
-                else
-                {
-                    WindowState = WindowState.Maximized;
-                }
-            }
-            else
-            {
-                // 拖拽窗口
-                DragMove();
-            }
-        }
    }

    /// <summary>
@@ -4,10 +4,18 @@
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:local="clr-namespace:Ink_Canvas"
-        mc:Ignorable="d" FontFamily="Microsoft YaHei UI" ui:WindowHelper.UseModernWindowStyle="True"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+        mc:Ignorable="d"
+        FontFamily="Microsoft YaHei UI"
        WindowStartupLocation="CenterScreen"
-        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" Topmost="True"
+        Topmost="True"
        Title="隐私说明 - Ink Canvas" Height="600" Width="600"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:TitleBar.ExtendViewIntoTitleBar="True"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:TitleBar.Height="48"
        Loaded="Window_Loaded" Closing="Window_Closing">
    <Window.Resources>
        <SolidColorBrush x:Key="PrivacyAgreementWindowBackground" Color="White"/>
@@ -18,15 +26,39 @@
        <SolidColorBrush x:Key="PrivacyAgreementWindowButtonAcceptBackground" Color="#3584e4"/>
        <SolidColorBrush x:Key="PrivacyAgreementWindowButtonAcceptForeground" Color="White"/>
    </Window.Resources>
-    <Grid Background="{DynamicResource PrivacyAgreementWindowBackground}">
-        <Label Content="隐私说明" 
-               Margin="10,10,10,0" 
-               VerticalAlignment="Top"
-               Foreground="{DynamicResource PrivacyAgreementWindowForeground}"
-               FontFamily="Microsoft YaHei UI"
-               FontSize="18"
-               FontWeight="Bold"/>
-        <ScrollViewer Margin="10,45,10,60"
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        
+        <!-- 自定义标题栏 -->
+        <Border x:Name="Border_TitleBarRoot"
+                Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}" 
+                           VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
+
+                <!--Right Inset-->
+                <Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
+                    Grid.Column="2"/>
+
+                <!--Right Buttons-->
+                <ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
+                    Orientation="Horizontal" Grid.Column="1" Spacing="5">
+                </ikw:SimpleStackPanel>
+            </Grid>
+        </Border>
+        
+        <!-- 主内容区 -->
+        <Grid Grid.Row="1" Background="{DynamicResource PrivacyAgreementWindowBackground}">
+            <ScrollViewer Margin="10,10,10,70"
                          VerticalScrollBarVisibility="Auto"
                          HorizontalScrollBarVisibility="Disabled">
                <TextBox Name="TextBoxPrivacyContent" 
@@ -95,5 +127,6 @@
                </Button>
            </StackPanel>
        </Grid>
+    </Grid>
 </Window>

@@ -4,11 +4,18 @@
        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
        xmlns:local="clr-namespace:Ink_Canvas"
-        mc:Ignorable="d" FontFamily="Microsoft YaHei UI" ui:WindowHelper.UseModernWindowStyle="True"
+        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
+        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
+        mc:Ignorable="d" FontFamily="Microsoft YaHei UI"
        WindowStartupLocation="CenterScreen"
-        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern" Topmost="True"
+        Topmost="True"
        Title="Ink Canvas 抽奖 - 点名历史记录" Height="500" Width="400"
-        Loaded="Window_Loaded">
+        Loaded="Window_Loaded"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:TitleBar.ExtendViewIntoTitleBar="True"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:TitleBar.Height="48">
    <Window.Resources>
        <!-- 主题资源 -->
        <SolidColorBrush x:Key="RollCallHistoryWindowBackground" Color="White"/>
@@ -17,7 +24,38 @@
        <SolidColorBrush x:Key="RollCallHistoryWindowButtonForeground" Color="Black"/>
        <SolidColorBrush x:Key="RollCallHistoryWindowBorderBrush" Color="#E4E4E7"/>
    </Window.Resources>
-    <Grid Background="{DynamicResource RollCallHistoryWindowBackground}">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        
+        <!-- 自定义标题栏 -->
+        <Border x:Name="Border_TitleBarRoot"
+                Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}" 
+                           VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
+
+                <!--Right Inset-->
+                <Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
+                    Grid.Column="2"/>
+
+                <!--Right Buttons-->
+                <ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
+                    Orientation="Horizontal" Grid.Column="1" Spacing="5">
+                </ikw:SimpleStackPanel>
+            </Grid>
+        </Border>
+        
+        <!-- 主内容区 -->
+        <Grid Grid.Row="1" Background="{DynamicResource RollCallHistoryWindowBackground}" Margin="10,10,10,10">
            <Label Content="点名历史记录" 
                   Margin="10" 
                   Foreground="{DynamicResource RollCallHistoryWindowForeground}"
@@ -42,5 +80,6 @@
                    Foreground="{DynamicResource RollCallHistoryWindowButtonForeground}"
                    BorderBrush="{DynamicResource RollCallHistoryWindowBorderBrush}"/>
        </Grid>
+    </Grid>
 </Window>

@@ -6,11 +6,46 @@
        xmlns:local="clr-namespace:Ink_Canvas"
        xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
        xmlns:ikw="http://schemas.inkore.net/lib/ui/wpf"
-        mc:Ignorable="d" Topmost="True" WindowStartupLocation="CenterScreen" ui:WindowHelper.UseModernWindowStyle="True"
-        ResizeMode="NoResize" Closed="Window_Closed" ui:ThemeManager.RequestedTheme="Light"
-        Title="演示文档设置 - Ink Canvas For Class CE" Height="160" Width="450" FontFamily="Microsoft YaHei UI">
+        mc:Ignorable="d" Topmost="True" WindowStartupLocation="CenterScreen"
+        ResizeMode="NoResize" Closed="Window_Closed"
+        Title="演示文档设置 - Ink Canvas For Class CE" Height="160" Width="450" FontFamily="Microsoft YaHei UI"
+        ui:ThemeManager.IsThemeAware="True"
+        ui:TitleBar.ExtendViewIntoTitleBar="True"
+        ui:WindowHelper.SystemBackdropType="Mica"
+        ui:WindowHelper.UseModernWindowStyle="True"
+        ui:TitleBar.Height="48">
    <Grid>
-        <Grid Margin="10">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        
+        <!-- 自定义标题栏 -->
+        <Border x:Name="Border_TitleBarRoot"
+                Height="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.Height)}">
+            <Grid>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition/>
+                    <ColumnDefinition Width="Auto"/>
+                    <ColumnDefinition Width="Auto"/>
+                </Grid.ColumnDefinitions>
+
+                <TextBlock Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=Title}" 
+                           VerticalAlignment="Center" Margin="12,0,0,0" FontSize="12" FontWeight="SemiBold"/>
+
+                <!--Right Inset-->
+                <Rectangle Width="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}, Path=(ui:TitleBar.SystemOverlayRightInset)}"
+                    Grid.Column="2"/>
+
+                <!--Right Buttons-->
+                <ikw:SimpleStackPanel x:Name="StackPanel_RightButtons"
+                    Orientation="Horizontal" Grid.Column="1" Spacing="5">
+                </ikw:SimpleStackPanel>
+            </Grid>
+        </Border>
+        
+        <!-- 主内容区 -->
+        <Grid Grid.Row="1" Margin="10,10,10,10" Background="{DynamicResource SettingsPageBackground}">
            <Grid.RowDefinitions>
                <RowDefinition/>
                <RowDefinition Height="40"/>