From 4772b9cce7f8f3ea92084ee27db387b454a09081 Mon Sep 17 00:00:00 2001
From: PrefacedCorg <1876568293@qq.com>
Date: Sat, 21 Mar 2026 16:18:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E4=BA=86=E4=B8=A4ui=20=E9=80=82?=
=?UTF-8?q?=E9=85=8D=E4=BA=86=E8=A7=A6=E6=91=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Ink Canvas/Windows/HistoryRollbackWindow.xaml | 342 +++++++-----------
.../Windows/HistoryRollbackWindow.xaml.cs | 48 ++-
Ink Canvas/Windows/OobeWindow.xaml | 16 +-
Ink Canvas/Windows/OobeWindow.xaml.cs | 33 ++
4 files changed, 200 insertions(+), 239 deletions(-)
diff --git a/Ink Canvas/Windows/HistoryRollbackWindow.xaml b/Ink Canvas/Windows/HistoryRollbackWindow.xaml
index d50a8420..5d8cc86a 100644
--- a/Ink Canvas/Windows/HistoryRollbackWindow.xaml
+++ b/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"
- WindowStartupLocation="CenterScreen" WindowStyle="None"
- Background="Transparent" MinHeight="550" MinWidth="800">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Title="历史版本回滚" Height="650" Width="900" ResizeMode="CanResize"
+ WindowStartupLocation="CenterScreen" WindowStyle="SingleBorderWindow"
+ Background="{DynamicResource SettingsPageBackground}" MinHeight="550" MinWidth="800"
+ SnapsToDevicePixels="True"
+ TextOptions.TextRenderingMode="ClearType"
+ TextOptions.TextFormattingMode="Display">
@@ -130,111 +22,125 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Ink Canvas/Windows/HistoryRollbackWindow.xaml.cs b/Ink Canvas/Windows/HistoryRollbackWindow.xaml.cs
index dae573f3..67755648 100644
--- a/Ink Canvas/Windows/HistoryRollbackWindow.xaml.cs
+++ b/Ink Canvas/Windows/HistoryRollbackWindow.xaml.cs
@@ -35,19 +35,37 @@ namespace Ink_Canvas
InitializeComponent();
this.channel = channel;
+ // 设置窗口置顶
+ this.Topmost = true;
+
// 应用当前主题
ApplyCurrentTheme();
- LoadVersions();
+ // 折叠浮动工具栏
+ CollapseFloatingBar();
- // 添加窗口拖动功能
- MouseDown += (sender, e) =>
+ LoadVersions();
+ }
+
+ ///
+ /// 折叠主窗口的浮动工具栏
+ ///
+ private async void CollapseFloatingBar()
+ {
+ try
{
- if (e.ChangedButton == MouseButton.Left)
+ // 获取主窗口实例
+ var mainWindow = Application.Current.MainWindow as MainWindow;
+ if (mainWindow != null)
{
- DragMove();
+ // 调用折叠方法
+ await mainWindow.FoldFloatingBar(null);
}
- };
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"折叠浮动工具栏时出错: {ex.Message}", LogHelper.LogType.Error);
+ }
}
///
@@ -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);
}
+
+
}
}
\ No newline at end of file
diff --git a/Ink Canvas/Windows/OobeWindow.xaml b/Ink Canvas/Windows/OobeWindow.xaml
index bbf5ebd8..cf1e8bb9 100644
--- a/Ink Canvas/Windows/OobeWindow.xaml
+++ b/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">