From 4724a432abf37ad5dcb253278180178ba9038ae1 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Wed, 1 Oct 2025 23:26:38 +0800
Subject: [PATCH] =?UTF-8?q?add:=E8=BD=AF=E4=BB=B6=E5=90=AF=E5=8A=A8?=
 =?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/Windows/SplashScreen.xaml    | 57 ++++++++++---------------
 Ink Canvas/Windows/SplashScreen.xaml.cs | 38 ++++++++++++-----
 2 files changed, 49 insertions(+), 46 deletions(-)

diff --git a/Ink Canvas/Windows/SplashScreen.xaml b/Ink Canvas/Windows/SplashScreen.xaml
index 4949f84a..268dfed3 100644
--- a/Ink Canvas/Windows/SplashScreen.xaml	
+++ b/Ink Canvas/Windows/SplashScreen.xaml	
@@ -13,16 +13,17 @@
     <Grid>
         <!-- 背景遮罩 -->
         <Rectangle Fill="#80000000" />
-        
+
         <!-- 启动图片容器 -->
         <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
             <StackPanel>
                 <!-- 启动图片 -->
                 <Image x:Name="StartupImage" 
+                        Source="pack://application:,,,/Resources/Startup-animation/ICC Autumn.png" 
                        Width="600" 
                        Height="450"
                        Stretch="Uniform" />
-                
+
                 <!-- 版本号显示 - 右上角 -->
                 <TextBlock x:Name="VersionTextBlock" 
                         FontSize="12" 
@@ -32,7 +33,7 @@
                         Margin="0,-385,50,0" 
                         Opacity="0.8" 
                         Panel.ZIndex="1000" />
-                
+
                 <!-- 加载文本 -->
                 <TextBlock x:Name="LoadingText" 
                            Text="正在启动 Ink Canvas..." 
@@ -41,39 +42,25 @@
                            Foreground="White"
                            HorizontalAlignment="Center"
                            Margin="0,-150,0,0" />
-                
+
                 <!-- 进度条 -->
-                <ProgressBar x:Name="LoadingProgress" 
-                             Width="530" 
-                             Height="5" 
-                             Margin="0,-170,0,0"
-                             Background="#40000000"
-                             Foreground="#0078D4"
-                             IsIndeterminate="True">
-                    <ProgressBar.Style>
-                        <Style TargetType="ProgressBar">
-                            <Setter Property="Template">
-                                <Setter.Value>
-                                    <ControlTemplate TargetType="ProgressBar">
-                                        <Grid>
-                                            <Border Name="PART_Track" 
-                                                    Background="{TemplateBinding Background}" 
-                                                    CornerRadius="4"/>
-                                            <Border Name="PART_Indicator" 
-                                                    Background="{TemplateBinding Foreground}" 
-                                                    CornerRadius="4"
-                                                    HorizontalAlignment="Left">
-                                                <Border.RenderTransform>
-                                                    <ScaleTransform ScaleX="1" ScaleY="1"/>
-                                                </Border.RenderTransform>
-                                            </Border>
-                                        </Grid>
-                                    </ControlTemplate>
-                                </Setter.Value>
-                            </Setter>
-                        </Style>
-                    </ProgressBar.Style>
-                </ProgressBar>
+                <Grid HorizontalAlignment="Center"
+                       Margin="1,-175,0,0"
+                       Width="530"
+                       Height="10">
+                    <!-- 进度条填充 -->
+                    <Border x:Name="ProgressBarFill"
+                             Background="#0198D4"
+                             CornerRadius="2.5"
+                             HorizontalAlignment="Left"
+                             Width="0">
+                    </Border>
+                    <!-- 进度条背景 -->
+                    <Border x:Name="ProgressBarBackground"
+                             CornerRadius="2.5"
+                             BorderThickness="1"
+                             ClipToBounds="True"/>
+                </Grid>
             </StackPanel>
         </Grid>
     </Grid>
diff --git a/Ink Canvas/Windows/SplashScreen.xaml.cs b/Ink Canvas/Windows/SplashScreen.xaml.cs
index 8af10ab9..593986cb 100644
--- a/Ink Canvas/Windows/SplashScreen.xaml.cs	
+++ b/Ink Canvas/Windows/SplashScreen.xaml.cs	
@@ -95,29 +95,45 @@ namespace Ink_Canvas.Windows
         {
             Dispatcher.Invoke(() =>
             {
-                if (LoadingProgress.IsIndeterminate)
+                // 获取进度条容器的实际宽度
+                double containerWidth = ProgressBarBackground.ActualWidth;
+                if (containerWidth <= 0)
                 {
-                    LoadingProgress.IsIndeterminate = false;
-                    LoadingProgress.Value = 0; 
+                    // 如果ActualWidth为0，使用设计时宽度
+                    containerWidth = 530;
                 }
                 
-                // 创建平滑过渡动画
-                var animation = new DoubleAnimation
+                // 计算目标宽度
+                double targetWidth = containerWidth * (progress / 100.0);
+                
+                // 创建Storyboard动画
+                var storyboard = new Storyboard();
+                
+                // 创建宽度动画
+                var widthAnimation = new DoubleAnimation
                 {
-                    From = LoadingProgress.Value,
-                    To = progress,
-                    Duration = TimeSpan.FromMilliseconds(300), 
+                    From = ProgressBarFill.Width,
+                    To = targetWidth,
+                    Duration = TimeSpan.FromMilliseconds(300),
                     EasingFunction = new CubicEase { EasingMode = EasingMode.EaseOut }
                 };
                 
+                // 设置动画目标
+                Storyboard.SetTarget(widthAnimation, ProgressBarFill);
+                Storyboard.SetTargetProperty(widthAnimation, new PropertyPath(Border.WidthProperty));
+                
+                // 添加动画到Storyboard
+                storyboard.Children.Add(widthAnimation);
+                
                 // 添加动画完成事件
-                animation.Completed += (s, e) =>
+                storyboard.Completed += (s, e) =>
                 {
                     // 确保最终值正确设置
-                    LoadingProgress.Value = progress;
+                    ProgressBarFill.Width = targetWidth;
                 };
                 
-                LoadingProgress.BeginAnimation(ProgressBar.ValueProperty, animation);
+                // 开始动画
+                storyboard.Begin();
             });
         }