From 9ac4070e4e89aff36d6fbd76b8e5a904391ced82 Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Tue, 24 Mar 2026 01:21:57 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=AA=97=E5=8F=A3=E6=A0=87=E9=A2=98?=
 =?UTF-8?q?=E6=A0=8F=E6=9C=80=E5=B0=8F=E5=8C=96=E9=9A=90=E8=97=8F=20oobe?=
 =?UTF-8?q?=20=E4=B8=8A=E4=B8=8B=E4=B8=80=E6=AD=A5=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E8=A7=A6=E6=91=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Windows/CloudStorageManagementWindow.xaml |  1 +
 Ink Canvas/Windows/HistoryRollbackWindow.xaml |  1 +
 Ink Canvas/Windows/OobeWindow.xaml            | 51 ++++++++++++++-----
 Ink Canvas/Windows/OobeWindow.xaml.cs         | 31 -----------
 Ink Canvas/Windows/PluginSettingsWindow.xaml  |  1 +
 5 files changed, 42 insertions(+), 43 deletions(-)

diff --git a/Ink Canvas/Windows/CloudStorageManagementWindow.xaml b/Ink Canvas/Windows/CloudStorageManagementWindow.xaml
index ca09ad10..89b59c92 100644
--- a/Ink Canvas/Windows/CloudStorageManagementWindow.xaml	
+++ b/Ink Canvas/Windows/CloudStorageManagementWindow.xaml	
@@ -10,6 +10,7 @@
         Title="云存储管理" Height="600" Width="900"
         WindowStartupLocation="CenterScreen"
         ResizeMode="CanResize"
+        Topmost="True"
         ui:ThemeManager.IsThemeAware="True"
         ui:TitleBar.ExtendViewIntoTitleBar="True"
         ui:WindowHelper.SystemBackdropType="Mica"
diff --git a/Ink Canvas/Windows/HistoryRollbackWindow.xaml b/Ink Canvas/Windows/HistoryRollbackWindow.xaml
index 78a03234..551e76ef 100644
--- a/Ink Canvas/Windows/HistoryRollbackWindow.xaml	
+++ b/Ink Canvas/Windows/HistoryRollbackWindow.xaml	
@@ -9,6 +9,7 @@
         mc:Ignorable="d"
         Title="历史版本回滚" Height="650" Width="900" ResizeMode="CanResize" 
         WindowStartupLocation="CenterScreen"
+        Topmost="True"
         Background="{DynamicResource SettingsPageBackground}" MinHeight="550" MinWidth="800"
         SnapsToDevicePixels="True"
         TextOptions.TextRenderingMode="ClearType"
diff --git a/Ink Canvas/Windows/OobeWindow.xaml b/Ink Canvas/Windows/OobeWindow.xaml
index 1a675cc5..eb2ad467 100644
--- a/Ink Canvas/Windows/OobeWindow.xaml	
+++ b/Ink Canvas/Windows/OobeWindow.xaml	
@@ -13,13 +13,9 @@
         MinWidth="400"
         WindowStartupLocation="CenterScreen"
         ResizeMode="CanResize"
-        ShowInTaskbar="False"
+        Topmost="True"
         Background="{DynamicResource SettingsPageBackground}"
         Loaded="OobeWindow_OnLoaded"
-        IsManipulationEnabled="True"
-        TouchDown="Window_TouchDown"
-        TouchMove="Window_TouchMove"
-        TouchUp="Window_TouchUp"
         ui:ThemeManager.IsThemeAware="True"
         ui:TitleBar.ExtendViewIntoTitleBar="True"
         ui:WindowHelper.SystemBackdropType="Mica"
@@ -28,33 +24,64 @@
 
     <Window.Resources>
         <Style x:Key="OobeSecondaryButtonStyle" TargetType="Button">
-            <Setter Property="Background" Value="{DynamicResource SettingsPageBackground}" />
+            <Setter Property="Background" Value="#f8f8f8" />
             <Setter Property="Foreground" Value="{DynamicResource SettingsPageForeground}" />
             <Setter Property="BorderBrush" Value="{DynamicResource SettingsPageBorderBrush}" />
             <Setter Property="BorderThickness" Value="1" />
             <Setter Property="Padding" Value="6,0" />
-            <Setter Property="IsManipulationEnabled" Value="True" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <Border Background="{TemplateBinding Background}"
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="4">
                             <ContentPresenter HorizontalAlignment="Center"
                                               VerticalAlignment="Center" />
                         </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Border" Property="Background" Value="#d8d8d8" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Border" Property="Background" Value="#e8e8e8" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
 
         <Style x:Key="OobePrimaryButtonStyle"
-               TargetType="Button"
-               BasedOn="{StaticResource OobeSecondaryButtonStyle}">
-            <Setter Property="Background" Value="{DynamicResource HistoryWindowPrimaryBrush}" />
-            <Setter Property="BorderBrush" Value="{DynamicResource HistoryWindowPrimaryBrush}" />
+               TargetType="Button">
+            <Setter Property="Background" Value="#3b82f6" />
+            <Setter Property="BorderBrush" Value="#3b82f6" />
             <Setter Property="Foreground" Value="White" />
+            <Setter Property="BorderThickness" Value="1" />
+            <Setter Property="Padding" Value="6,0" />
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="Button">
+                        <Border x:Name="Border"
+                                Background="{TemplateBinding Background}"
+                                BorderBrush="{TemplateBinding BorderBrush}"
+                                BorderThickness="{TemplateBinding BorderThickness}"
+                                CornerRadius="4">
+                            <ContentPresenter HorizontalAlignment="Center"
+                                              VerticalAlignment="Center" />
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsPressed" Value="True">
+                                <Setter TargetName="Border" Property="Background" Value="#1d4ed8" />
+                            </Trigger>
+                            <Trigger Property="IsMouseOver" Value="True">
+                                <Setter TargetName="Border" Property="Background" Value="#2563eb" />
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
         </Style>
     </Window.Resources>
 
diff --git a/Ink Canvas/Windows/OobeWindow.xaml.cs b/Ink Canvas/Windows/OobeWindow.xaml.cs
index ddfcc6e9..42eca683 100644
--- a/Ink Canvas/Windows/OobeWindow.xaml.cs	
+++ b/Ink Canvas/Windows/OobeWindow.xaml.cs	
@@ -474,38 +474,7 @@ namespace Ink_Canvas.Windows
             }
         }
 
-        /// <summary>
-        /// 处理触摸事件，确保窗口能够响应触摸屏操作。
-        /// </summary>
-        /// <param name="sender">事件发送者。</param>
-        /// <param name="e">触摸事件参数。</param>
-        private void Window_TouchDown(object sender, System.Windows.Input.TouchEventArgs e)
-        {
-            // 触摸事件处理逻辑
-            e.Handled = false;
-        }
 
-        /// <summary>
-        /// 处理触摸移动事件。
-        /// </summary>
-        /// <param name="sender">事件发送者。</param>
-        /// <param name="e">触摸事件参数。</param>
-        private void Window_TouchMove(object sender, System.Windows.Input.TouchEventArgs e)
-        {
-            // 触摸移动事件处理逻辑
-            e.Handled = false;
-        }
-
-        /// <summary>
-        /// 处理触摸抬起事件。
-        /// </summary>
-        /// <param name="sender">事件发送者。</param>
-        /// <param name="e">触摸事件参数。</param>
-        private void Window_TouchUp(object sender, System.Windows.Input.TouchEventArgs e)
-        {
-            // 触摸抬起事件处理逻辑
-            e.Handled = false;
-        }
 
         /// <summary>
         /// 根据当前步骤索引更新向导界面：显示对应步骤面板，播放切换动画，并刷新步骤指示、标题、子标题和按钮文本/可见性。
diff --git a/Ink Canvas/Windows/PluginSettingsWindow.xaml b/Ink Canvas/Windows/PluginSettingsWindow.xaml
index 38d64ce8..65633802 100644
--- a/Ink Canvas/Windows/PluginSettingsWindow.xaml	
+++ b/Ink Canvas/Windows/PluginSettingsWindow.xaml	
@@ -10,6 +10,7 @@
         Title="插件管理" Height="550" Width="800"
         WindowStartupLocation="CenterScreen"
         ResizeMode="CanResize"
+        Topmost="True"
         ui:ThemeManager.IsThemeAware="True"
         ui:TitleBar.ExtendViewIntoTitleBar="True"
         ui:WindowHelper.SystemBackdropType="Mica"