From 3f8cabc7e065dc7f89f7dc82498ef265b5c4ea77 Mon Sep 17 00:00:00 2001
From: CJK_mkp <113243675+CJKmkp@users.noreply.github.com>
Date: Sat, 27 Dec 2025 16:41:30 +0800
Subject: [PATCH] =?UTF-8?q?improve:PPT=E6=94=BE=E6=98=A0=E6=97=B6=E7=9A=84?=
 =?UTF-8?q?=E6=B5=AE=E5=8A=A8=E6=A0=8F=E5=AE=9A=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MainWindow_cs/MW_FloatingBarIcons.cs      |  5 +-
 Ink Canvas/MainWindow_cs/MW_PPT.cs            | 47 ++++---------------
 2 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 6a31739c..d27e7bb7 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -3082,10 +3082,7 @@ namespace Ink_Canvas
                                 await Task.Delay(700);
                                 await Dispatcher.InvokeAsync(() =>
                                 {
-                                    if (_pptManager?.IsInSlideShow != true)
-                                    {
-                                        FoldFloatingBar_MouseUp(new object(), null);
-                                    }
+                                    FoldFloatingBar_MouseUp(new object(), null);
                                 });
                             });
                         }
diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 666b492e..352052cc 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -730,7 +730,7 @@ namespace Ink_Canvas
                     if (Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow &&
                         !Settings.Automation.IsAutoFoldInPPTSlideShow)
                     {
-                        await Task.Delay(300);
+                        await Task.Delay(600);
                         // 先进入批注模式，这会显示调色盘
                         PenIcon_Click(null, null);
                         // 然后设置颜色
@@ -771,48 +771,17 @@ namespace Ink_Canvas
                     LoadCurrentSlideInk(currentSlide);
                 });
 
+
                 if (!isFloatingBarFolded)
                 {
-                    _ = Task.Run(async () =>
+                    new Thread(() =>
                     {
-                        try
+                        Thread.Sleep(100);
+                        Application.Current.Dispatcher.Invoke(() =>
                         {
-                            await Task.Delay(100);
-
-                            await Application.Current.Dispatcher.InvokeAsync(() =>
-                            {
-                                ViewboxFloatingBar.UpdateLayout();
-
-                                // 如果浮动栏宽度仍未计算好，再等待一段时间
-                                if (ViewboxFloatingBar.ActualWidth <= 0)
-                                {
-                                    LogHelper.WriteLogToFile("浮动栏宽度未准备好，等待布局完成", LogHelper.LogType.Trace);
-                                }
-                            });
-
-                            await Task.Delay(100);
-
-                            await Application.Current.Dispatcher.InvokeAsync(() =>
-                            {
-                                PureViewboxFloatingBarMarginAnimationInPPTMode(false);
-                            });
-                        }
-                        catch (Exception)
-                        {
-
-                            try
-                            {
-                                await Task.Delay(100);
-                                await Application.Current.Dispatcher.InvokeAsync(() =>
-                                {
-                                    ViewboxFloatingBarMarginAnimation(60);
-                                });
-                            }
-                            catch (Exception)
-                            {
-                            }
-                        }
-                    });
+                            ViewboxFloatingBarMarginAnimation(60);
+                        });
+                    }).Start();
                 }
             }
             catch (Exception)