From ab6425e0d91a054f0ce36761e70e6b580071389e Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 27 Dec 2025 22:53:34 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=B5=AE=E5=8A=A8=E6=A0=8F=E6=94=B6?=
 =?UTF-8?q?=E7=BA=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 36 +++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 8 deletions(-)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 352052cc..de6b19c0 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -870,7 +870,7 @@ namespace Ink_Canvas
             try
             {
                 // PPT退出时自动收纳浮动栏
-                if (!isFloatingBarFolded)
+                if (Settings.Automation.IsAutoFoldAfterPPTSlideShow && !isFloatingBarFolded)
                 {
                     FoldFloatingBar_MouseUp(new object(), null);
                 }
@@ -974,8 +974,15 @@ namespace Ink_Canvas
                 await Task.Delay(100);
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
-                    PureViewboxFloatingBarMarginAnimationInDesktopMode();
-                    ViewboxFloatingBarMarginAnimation(-60);
+                    if (Settings.Automation.IsAutoFoldAfterPPTSlideShow)
+                    {
+                        PureViewboxFloatingBarMarginAnimationInDesktopMode();
+                        ViewboxFloatingBarMarginAnimation(-60);
+                    }
+                    else
+                    {
+                        PureViewboxFloatingBarMarginAnimationInDesktopMode();
+                    }
                 });
             }
             catch (Exception ex)
@@ -1745,8 +1752,15 @@ namespace Ink_Canvas
                 SetCurrentToolMode(InkCanvasEditingMode.None);
 
                 await Task.Delay(150);
-                // PPT退出时自动收纳，使用收纳状态的边距动画
-                ViewboxFloatingBarMarginAnimation(-60);
+
+                if (Settings.Automation.IsAutoFoldAfterPPTSlideShow)
+                {
+                    ViewboxFloatingBarMarginAnimation(-60);
+                }
+                else
+                {
+                    ViewboxFloatingBarMarginAnimation(100, true);
+                }
             }
             catch (Exception ex)
             {
@@ -1762,9 +1776,15 @@ namespace Ink_Canvas
                 // 异常情况下也手动处理自动收纳
                 await HandleManualSlideShowEnd();
 
-                // 异常情况下也要自动收纳，使用收纳状态的边距动画
                 await Task.Delay(150);
-                ViewboxFloatingBarMarginAnimation(-60);
+                if (Settings.Automation.IsAutoFoldAfterPPTSlideShow)
+                {
+                    ViewboxFloatingBarMarginAnimation(-60);
+                }
+                else
+                {
+                    ViewboxFloatingBarMarginAnimation(100, true);
+                }
             }
         }
 
@@ -1776,7 +1796,7 @@ namespace Ink_Canvas
             try
             {
                 // PPT退出时自动收纳浮动栏
-                if (!isFloatingBarFolded)
+                if (Settings.Automation.IsAutoFoldAfterPPTSlideShow && !isFloatingBarFolded)
                 {
                     FoldFloatingBar_MouseUp(new object(), null);
                 }