This commit is contained in:
CJK_mkp
2025-09-18 17:58:51 +08:00
committed by GitHub
parent 1b96c70386
commit 71c77da898
+8 -30
View File
@@ -1,4 +1,4 @@
using Ink_Canvas.Helpers; using Ink_Canvas.Helpers;
using iNKORE.UI.WPF.Modern; using iNKORE.UI.WPF.Modern;
using Microsoft.Office.Core; using Microsoft.Office.Core;
using Microsoft.Office.Interop.PowerPoint; using Microsoft.Office.Interop.PowerPoint;
@@ -622,10 +622,11 @@ namespace Ink_Canvas
// 记录进入放映时浮动栏收纳状态 // 记录进入放映时浮动栏收纳状态
wasFloatingBarFoldedWhenEnterSlideShow = isFloatingBarFolded; wasFloatingBarFoldedWhenEnterSlideShow = isFloatingBarFolded;
if (Settings.Automation.IsAutoFoldInPPTSlideShow && !isFloatingBarFolded) if (Settings.Automation.IsAutoFoldInPPTSlideShow)
FoldFloatingBar_MouseUp(new object(), null); {
else if (isFloatingBarFolded) if (!isFloatingBarFolded)
await UnFoldFloatingBar(new object()); FoldFloatingBar_MouseUp(new object(), null);
}
isStopInkReplay = true; isStopInkReplay = true;
@@ -772,8 +773,8 @@ namespace Ink_Canvas
{ {
try try
{ {
// 处理浮动栏状态 // 处理浮动栏状态:严格按进入前的状态恢复
if (Settings.Automation.IsAutoFoldAfterPPTSlideShow && wasFloatingBarFoldedWhenEnterSlideShow) if (wasFloatingBarFoldedWhenEnterSlideShow)
{ {
if (!isFloatingBarFolded) FoldFloatingBar_MouseUp(new object(), null); if (!isFloatingBarFolded) FoldFloatingBar_MouseUp(new object(), null);
} }
@@ -1666,28 +1667,5 @@ namespace Ink_Canvas
{ {
BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null); BtnPPTSlideShowEnd_Click(BtnPPTSlideShowEnd, null);
} }
} }
} }