From 40eeb9db66f4dd29a60c3f49f25007e9baef7187 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 23 Aug 2025 19:04:46 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E9=80=80=E5=87=BA=E6=94=BE=E6=98=A0?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=90=8E=E6=B5=AE=E5=8A=A8=E6=A0=8F=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Ink Canvas/MainWindow_cs/MW_PPT.cs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs
index 384f86c3..07b2abcc 100644
--- a/Ink Canvas/MainWindow_cs/MW_PPT.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs	
@@ -411,6 +411,16 @@ namespace Ink_Canvas
                             EnableTwoFingerGestureBorder.Visibility = Visibility.Collapsed;
                         }
 
+                        // 退出PPT模式时隐藏快捷调色盘
+                        if (QuickColorPalettePanel != null)
+                        {
+                            QuickColorPalettePanel.Visibility = Visibility.Collapsed;
+                        }
+                        if (QuickColorPaletteSingleRowPanel != null)
+                        {
+                            QuickColorPaletteSingleRowPanel.Visibility = Visibility.Collapsed;
+                        }
+
                         if (GridTransparencyFakeBackground.Background != Brushes.Transparent)
                             BtnHideInkCanvas_Click(BtnHideInkCanvas, null);
                     }
@@ -423,6 +433,9 @@ namespace Ink_Canvas
                 await Task.Delay(150);
                 await Application.Current.Dispatcher.InvokeAsync(() =>
                 {
+                    // 强制重新计算浮动栏位置，确保在退出PPT模式后正确复位
+                    // 先调用桌面模式的复位方法，然后调用通用的位置计算方法
+                    PureViewboxFloatingBarMarginAnimationInDesktopMode();
                     ViewboxFloatingBarMarginAnimation(100, true);
                 });
             }