diff --git a/Ink Canvas.sln.DotSettings.user b/Ink Canvas.sln.DotSettings.user
index 0401f804..21fc1f49 100644
--- a/Ink Canvas.sln.DotSettings.user
+++ b/Ink Canvas.sln.DotSettings.user
@@ -1,4 +1,6 @@
WARNING
C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\amd64\MSBuild.exe
- 1114112
\ No newline at end of file
+ 1114112
+ True
+ True
\ No newline at end of file
diff --git a/Ink Canvas/Windows/HasNewUpdateWindow.xaml b/Ink Canvas/Windows/HasNewUpdateWindow.xaml
index 61d8f5d9..dd2542ba 100644
--- a/Ink Canvas/Windows/HasNewUpdateWindow.xaml
+++ b/Ink Canvas/Windows/HasNewUpdateWindow.xaml
@@ -7,27 +7,218 @@
xmlns:ui="http://schemas.inkore.net/lib/ui/wpf/modern"
xmlns:mdxam="clr-namespace:MdXaml;assembly=MdXaml"
mc:Ignorable="d"
- ui:WindowHelper.UseModernWindowStyle = "True"
+ ui:WindowHelper.UseModernWindowStyle = "False"
ui:WindowHelper.SystemBackdropType="Mica"
- ui:TitleBar.Height="36"
- Title="InkCanvasForClass CE有新版本可用" Height="600" Width="850" ResizeMode="NoResize"
- WindowStartupLocation="CenterScreen">
+ Title="InkCanvasForClass CE有新版本可用" Height="650" Width="900" ResizeMode="NoResize"
+ WindowStartupLocation="CenterScreen" WindowStyle="None" AllowsTransparency="True"
+ Background="#f8fafc">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
# InkCanvasForClass v5.0.2更新
你好，旅行者们，本次InkCanvasForClass Community Edition更新带来了如下新功能供您探索：
@@ -42,48 +233,93 @@
8. 带来了基于FitToCurve的笔迹平滑，基于贝塞尔曲线平滑，让墨迹线条更加优美好看。
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Ink Canvas/Windows/HasNewUpdateWindow.xaml.cs b/Ink Canvas/Windows/HasNewUpdateWindow.xaml.cs
index 09b0010b..8755abff 100644
--- a/Ink Canvas/Windows/HasNewUpdateWindow.xaml.cs
+++ b/Ink Canvas/Windows/HasNewUpdateWindow.xaml.cs
@@ -11,6 +11,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
+using System.Windows.Input;
using System.Windows.Interop;
using System.Windows.Media;
@@ -143,7 +144,13 @@ namespace Ink_Canvas
UpdateLaterButton.IsEnabled = false;
SkipVersionButton.IsEnabled = false;
DownloadProgressPanel.Visibility = Visibility.Visible;
- DownloadProgressBar.Value = 0;
+
+ // 重置进度条
+ var progressFill = FindName("ProgressFill") as Border;
+ if (progressFill != null)
+ {
+ progressFill.Width = 0;
+ }
DownloadProgressText.Text = "正在准备下载...";
// 启动多线路下载
@@ -156,7 +163,12 @@ namespace Ink_Canvas
{
Dispatcher.Invoke(() =>
{
- DownloadProgressBar.Value = percent;
+ // 更新自定义进度条
+ progressFill = FindName("ProgressFill") as Border;
+ if (progressFill != null)
+ {
+ progressFill.Width = (percent / 100.0) * 400; // 400是进度条总宽度
+ }
DownloadProgressText.Text = text;
});
});
@@ -174,7 +186,12 @@ namespace Ink_Canvas
if (downloadSuccess)
{
- DownloadProgressBar.Value = 100;
+ // 设置进度条为100%
+ progressFill = FindName("ProgressFill") as Border;
+ if (progressFill != null)
+ {
+ progressFill.Width = 400; // 100%完成
+ }
DownloadProgressText.Text = "下载完成，准备安装...";
await Task.Delay(800);
// 设置结果为立即更新
@@ -215,6 +232,27 @@ namespace Ink_Canvas
Close();
}
+ private void CloseButton_Click(object sender, RoutedEventArgs e)
+ {
+ LogHelper.WriteLogToFile("AutoUpdate | Close button clicked");
+
+ // 设置结果为稍后更新（默认行为）
+ Result = UpdateResult.UpdateLater;
+
+ // 关闭窗口
+ DialogResult = false;
+ Close();
+ }
+
+ private void TitleBar_MouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+ {
+ // 开始拖动窗口
+ if (e.LeftButton == MouseButtonState.Pressed)
+ {
+ DragMove();
+ }
+ }
+
// 根据屏幕分辨率调整窗口大小