改了两ui 适配了触摸

Ink Canvas/Windows/HistoryRollbackWindow.xaml

@@ -9,120 +9,12 @@
         mc:Ignorable="d"
         ui:WindowHelper.UseModernWindowStyle="False"
         ui:WindowHelper.SystemBackdropType="Mica"
-        Title="历史版本回滚" Height="650" Width="900" ResizeMode="NoResize" 
+        Title="历史版本回滚" Height="650" Width="900" ResizeMode="CanResize" 
-        WindowStartupLocation="CenterScreen" WindowStyle="None" 
+        WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow" 
-        Background="Transparent" MinHeight="550" MinWidth="800">
+        Background="{DynamicResource SettingsPageBackground}" MinHeight="550" MinWidth="800"
-    <Window.Template>
+        SnapsToDevicePixels="True"
-        <ControlTemplate TargetType="Window">
+        TextOptions.TextRenderingMode="ClearType"
-            <Border Background="{DynamicResource SettingsPageBackground}" 
+        TextOptions.TextFormattingMode="Display">
-                    CornerRadius="8" 
-                    BorderBrush="{DynamicResource SettingsPageBorderBrush}" 
-                    BorderThickness="1">
-                <Border.Effect>
-                    <DropShadowEffect Color="#000000" BlurRadius="20" ShadowDepth="0" Opacity="0.1"/>
-                </Border.Effect>
-                <AdornerDecorator>
-                    <Grid>
-                        <!-- 标题栏 -->
-                        <Border Background="{DynamicResource SettingsPageBackground}" Height="48" VerticalAlignment="Top">
-                            <Grid>
-                                <TextBlock Text="{TemplateBinding Title}" 
-                                         FontSize="14" FontWeight="SemiBold" 
-                                         Foreground="{DynamicResource SettingsPageForeground}" 
-                                         VerticalAlignment="Center" 
-                                         Margin="16,0,0,0"/>
-                                <!-- 最小化按钮 -->
-                                <Button Name="MinimizeButton" 
-                                        HorizontalAlignment="Right" 
-                                        VerticalAlignment="Top" 
-                                        Margin="0,8,40,0"
-                                        Width="32" Height="32" 
-                                        Background="Transparent" 
-                                        BorderThickness="0"
-                                        Click="MinimizeButton_Click"
-                                        Cursor="Hand"
-                                        ToolTip="最小化">
-                                    <Button.Template>
-                                        <ControlTemplate TargetType="Button">
-                                            <Border Background="{TemplateBinding Background}" 
-                                                    CornerRadius="4" 
-                                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                                    BorderBrush="{TemplateBinding BorderBrush}">
-                                                <TextBlock Text="−" FontSize="14" 
-                                                         Foreground="{DynamicResource SettingsPageForeground}" 
-                                                         HorizontalAlignment="Center" 
-                                                         VerticalAlignment="Center"/>
-                                            </Border>
-                                            <ControlTemplate.Triggers>
-                                                <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter Property="Background">
-                                                        <Setter.Value>
-                                                            <SolidColorBrush Color="#FF2563eb" Opacity="0.1"/>
-                                                        </Setter.Value>
-                                                    </Setter>
-                                                </Trigger>
-                                                <Trigger Property="IsPressed" Value="True">
-                                                    <Setter Property="Background">
-                                                        <Setter.Value>
-                                                            <SolidColorBrush Color="#FF2563eb" Opacity="0.2"/>
-                                                        </Setter.Value>
-                                                    </Setter>
-                                                </Trigger>
-                                            </ControlTemplate.Triggers>
-                                        </ControlTemplate>
-                                    </Button.Template>
-                                </Button>
-                                
-                                <!-- 关闭按钮 -->
-                                <Button Name="CloseButton" 
-                                        HorizontalAlignment="Right" 
-                                        VerticalAlignment="Top" 
-                                        Margin="0,8,8,0"
-                                        Width="32" Height="32" 
-                                        Background="Transparent" 
-                                        BorderThickness="0"
-                                        Click="CloseButton_Click"
-                                        Cursor="Hand"
-                                        ToolTip="关闭">
-                                    <Button.Template>
-                                        <ControlTemplate TargetType="Button">
-                                            <Border Background="{TemplateBinding Background}" 
-                                                    CornerRadius="4" 
-                                                    BorderThickness="{TemplateBinding BorderThickness}"
-                                                    BorderBrush="{TemplateBinding BorderBrush}">
-                                                <TextBlock Text="×" FontSize="14" 
-                                                         Foreground="{DynamicResource SettingsPageForeground}" 
-                                                         HorizontalAlignment="Center" 
-                                                         VerticalAlignment="Center"/>
-                                            </Border>
-                                            <ControlTemplate.Triggers>
-                                                <Trigger Property="IsMouseOver" Value="True">
-                                                    <Setter Property="Background">
-                                                        <Setter.Value>
-                                                            <SolidColorBrush Color="#ef4444" Opacity="0.1"/>
-                                                        </Setter.Value>
-                                                    </Setter>
-                                                </Trigger>
-                                                <Trigger Property="IsPressed" Value="True">
-                                                    <Setter Property="Background">
-                                                        <Setter.Value>
-                                                            <SolidColorBrush Color="#ef4444" Opacity="0.2"/>
-                                                        </Setter.Value>
-                                                    </Setter>
-                                                </Trigger>
-                                            </ControlTemplate.Triggers>
-                                        </ControlTemplate>
-                                    </Button.Template>
-                                </Button>
-                            </Grid>
-                        </Border>
-                        <!-- 内容区域 -->
-                        <ContentPresenter Margin="0,48,0,0"/>
-                    </Grid>
-                </AdornerDecorator>
-            </Border>
-        </ControlTemplate>
-    </Window.Template>
     <Window.Resources>
         <!-- 主题相关颜色资源 -->
         <SolidColorBrush x:Key="PrimaryBrush" Color="#FF2563eb"/>
@@ -130,26 +22,29 @@
         <SolidColorBrush x:Key="TextSecondaryBrush" Color="#FF6b7280"/>
     </Window.Resources>
     
-    <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled">
+    <Grid Background="Transparent" Margin="20">
-        <Grid Background="Transparent">
+        <Grid.RowDefinitions>
-            <!-- 主内容区域 -->
+            <RowDefinition Height="Auto"/>
-            <ikw:SimpleStackPanel VerticalAlignment="Stretch" Spacing="0" Margin="20">
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        
         <!-- 标题区域 -->
-            <ikw:SimpleStackPanel Orientation="Horizontal" Spacing="12" Margin="0,0,0,16">
+        <ikw:SimpleStackPanel Grid.Row="0" Orientation="Horizontal" Spacing="12" Margin="0,0,0,16">
             <Border Background="{DynamicResource PrimaryBrush}" CornerRadius="16" Padding="12" Margin="0,0,0,0">
                 <ui:SymbolIcon Symbol="Undo" FontSize="20" Foreground="White" 
                               VerticalAlignment="Center"/>
             </Border>
             <ikw:SimpleStackPanel VerticalAlignment="Center" Spacing="4">
-                    <TextBlock Text="历史版本回滚" FontSize="22" FontWeight="Bold" 
+                    <TextBlock Text="选择要回滚到的历史版本" FontSize="22" FontWeight="Bold" 
                          Foreground="{DynamicResource TextPrimaryBrush}"/>
-                    <TextBlock Text="选择要回滚到的历史版本" FontSize="14" 
-                             Foreground="{DynamicResource TextSecondaryBrush}"/>
                 </ikw:SimpleStackPanel>
         </ikw:SimpleStackPanel>
         
         <!-- 版本选择卡片 -->
-            <Border Background="{DynamicResource SettingsPageBackground}" 
+        <Border Grid.Row="1"
+                Background="{DynamicResource SettingsPageBackground}" 
                 BorderBrush="{DynamicResource SettingsPageBorderBrush}" 
                 BorderThickness="1" 
                 CornerRadius="12" 
@@ -169,7 +64,8 @@
         </Border>
         
         <!-- 发布说明卡片 -->
-            <Border Background="{DynamicResource SettingsPageBackground}" 
+        <Border Grid.Row="2"
+                Background="{DynamicResource SettingsPageBackground}" 
                 BorderBrush="{DynamicResource SettingsPageBorderBrush}" 
                 BorderThickness="1" 
                 CornerRadius="12" 
@@ -178,30 +74,42 @@
             <Border.Effect>
                 <DropShadowEffect Color="#000000" BlurRadius="8" ShadowDepth="0" Opacity="0.05"/>
             </Border.Effect>
-                <ikw:SimpleStackPanel Spacing="16">
+            <Grid>
-                    <TextBlock Text="版本更新说明" FontSize="16" FontWeight="SemiBold" 
+                <Grid.RowDefinitions>
-                             Foreground="{DynamicResource TextPrimaryBrush}"/>
+                    <RowDefinition Height="Auto"/>
-                    <Border Background="{DynamicResource SettingsPageBackground}" 
+                    <RowDefinition Height="*"/>
+                </Grid.RowDefinitions>
+                <TextBlock Grid.Row="0"
+                          Text="版本更新说明" FontSize="16" FontWeight="SemiBold" 
+                          Foreground="{DynamicResource TextPrimaryBrush}"
+                          Margin="0,0,0,16"/>
+                <Border Grid.Row="1"
+                      Background="{DynamicResource SettingsPageBackground}" 
                       BorderBrush="{DynamicResource SettingsPageBorderBrush}" 
                       BorderThickness="1" 
-                          CornerRadius="8" 
+                      CornerRadius="8">
-                          MinHeight="150" MaxHeight="250">
                     <Border.Effect>
                         <DropShadowEffect Color="#000000" BlurRadius="4" ShadowDepth="0" Opacity="0.03"/>
                     </Border.Effect>
-                        <ScrollViewer VerticalScrollBarVisibility="Auto" 
+                    <ScrollViewer x:Name="InnerReleaseNotesScrollViewer"
+                                VerticalScrollBarVisibility="Auto" 
                                 HorizontalScrollBarVisibility="Disabled"
-                                    Padding="16">
+                                Padding="16"
+                                PanningMode="VerticalOnly"
+                                PanningRatio="1.0"
+                                IsManipulationEnabled="True">
                         <mdxam:MarkdownScrollViewer x:Name="ReleaseNotesViewer" 
                                                   Foreground="{DynamicResource TextPrimaryBrush}" 
-                                                      MarkdownStyleName="GithubLike"/>
+                                                  MarkdownStyleName="GithubLike"
+                                                  IsHitTestVisible="False" 
+                                                  IsManipulationEnabled="False"/>
                     </ScrollViewer>
                 </Border>
-                </ikw:SimpleStackPanel>
+            </Grid>
         </Border>
         
         <!-- 操作按钮区域 -->
-            <ikw:SimpleStackPanel Spacing="16" Margin="0,0,0,16">
+        <ikw:SimpleStackPanel Grid.Row="3" Spacing="16" Margin="0,0,0,0">
             <Button x:Name="RollbackButton" 
                   Content="回滚到此版本" 
                   HorizontalAlignment="Center"
@@ -234,7 +142,5 @@
                 </ikw:SimpleStackPanel>
             </Border>
         </ikw:SimpleStackPanel>
-        </ikw:SimpleStackPanel>
     </Grid>
-    </ScrollViewer>
 </Window>

Ink Canvas/Windows/HistoryRollbackWindow.xaml.cs

@@ -35,19 +35,37 @@ namespace Ink_Canvas
             InitializeComponent();
             this.channel = channel;
 
+            // 设置窗口置顶
+            this.Topmost = true;
+
             // 应用当前主题
             ApplyCurrentTheme();
 
-            LoadVersions();
+            // 折叠浮动工具栏
+            CollapseFloatingBar();
 
-            // 添加窗口拖动功能
+            LoadVersions();
-            MouseDown += (sender, e) =>
+        }
-            {
+
-                if (e.ChangedButton == MouseButton.Left)
+        /// <summary>
-                {
+        /// 折叠主窗口的浮动工具栏
-                    DragMove();
+        /// </summary>
+        private async void CollapseFloatingBar()
+        {
+            try
+            {
+                // 获取主窗口实例
+                var mainWindow = Application.Current.MainWindow as MainWindow;
+                if (mainWindow != null)
+                {
+                    // 调用折叠方法
+                    await mainWindow.FoldFloatingBar(null);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogHelper.WriteLogToFile($"折叠浮动工具栏时出错: {ex.Message}", LogHelper.LogType.Error);
             }
-            };
         }
 
         /// <summary>
@@ -223,16 +241,16 @@ namespace Ink_Canvas
                 Foreground = (Brush)Resources["TextPrimaryBrush"]
             };
 
-            var daysComboBox = new ComboBox
+            var daysComboBox = new System.Windows.Controls.ComboBox
             {
                 Width = 200,
                 Height = 36,
-                HorizontalAlignment = HorizontalAlignment.Left
+                HorizontalAlignment = System.Windows.HorizontalAlignment.Left
             };
 
             for (int i = 0; i <= 7; i++)
             {
-                daysComboBox.Items.Add(new ComboBoxItem
+                daysComboBox.Items.Add(new System.Windows.Controls.ComboBoxItem
                 {
                     Content = $"{i} 天",
                     Tag = i
@@ -250,7 +268,7 @@ namespace Ink_Canvas
             if (dialogResult == ContentDialogResult.Primary)
             {
                 int days = 1;
-                if (daysComboBox.SelectedItem is ComboBoxItem selectedItemCombo &&
+                if (daysComboBox.SelectedItem is System.Windows.Controls.ComboBoxItem selectedItemCombo &&
                     selectedItemCombo.Tag != null &&
                     int.TryParse(selectedItemCombo.Tag.ToString(), out int selectedDays))
                 {
@@ -323,20 +341,14 @@ namespace Ink_Canvas
             }
         }
 
-        private void MinimizeButton_Click(object sender, RoutedEventArgs e)
-        {
-            WindowState = WindowState.Minimized;
-        }
 
-        private void CloseButton_Click(object sender, RoutedEventArgs e)
-        {
-            Close();
-        }
 
         protected override void OnClosing(CancelEventArgs e)
         {
             downloadCts?.Cancel();
             base.OnClosing(e);
         }
+
+
     }
 }

Ink Canvas/Windows/OobeWindow.xaml

@@ -7,11 +7,17 @@
         Title="欢迎使用 InkCanvasForClass"
         Height="460"
         Width="780"
+        MinHeight="300"
+        MinWidth="400"
         WindowStartupLocation="CenterScreen"
-        ResizeMode="NoResize"
+        ResizeMode="CanResize"
         ShowInTaskbar="False"
         Background="{DynamicResource SettingsPageBackground}"
-        Loaded="OobeWindow_OnLoaded">
+        Loaded="OobeWindow_OnLoaded"
+        IsManipulationEnabled="True"
+        TouchDown="Window_TouchDown"
+        TouchMove="Window_TouchMove"
+        TouchUp="Window_TouchUp">
 
     <Window.Resources>
         <Style x:Key="OobeSecondaryButtonStyle" TargetType="Button">
@@ -20,6 +26,7 @@
             <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">
@@ -70,7 +77,10 @@
         <ScrollViewer Grid.Row="1"
                       Margin="0,24,0,24"
                       VerticalScrollBarVisibility="Auto"
-                      HorizontalScrollBarVisibility="Disabled">
+                      HorizontalScrollBarVisibility="Disabled"
+                      PanningMode="VerticalOnly"
+                      PanningRatio="1.0"
+                      IsManipulationEnabled="True">
             <Border Padding="18"
                     Background="{DynamicResource SettingsPageBackground}"
                     CornerRadius="10">

Ink Canvas/Windows/OobeWindow.xaml.cs

@@ -474,6 +474,39 @@ 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>
         /// 根据当前步骤索引更新向导界面：显示对应步骤面板，播放切换动画，并刷新步骤指示、标题、子标题和按钮文本/可见性。
         /// </summary>