This commit is contained in:
2025-09-20 11:08:52 +08:00
parent d1a1b17d29
commit 313049f873
4 changed files with 8 additions and 3 deletions
+2 -1
View File
@@ -182,7 +182,8 @@ namespace Ink_Canvas.Helpers
bool shouldShowButtons = ShowPPTButton && bool shouldShowButtons = ShowPPTButton &&
_mainWindow.BtnPPTSlideShowEnd.Visibility == Visibility.Visible && _mainWindow.BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
isInSlideShow && isInSlideShow &&
hasValidPageCount; hasValidPageCount &&
!Settings.Automation.IsAutoFoldInPPTSlideShow;
if (!shouldShowButtons) if (!shouldShowButtons)
{ {
+3 -1
View File
@@ -260,10 +260,12 @@ namespace Ink_Canvas
} }
// 只有在PPT放映模式下且页数有效时才显示翻页按钮 // 只有在PPT放映模式下且页数有效时才显示翻页按钮
// 但是,如果启用了PPT自动收纳功能,则不显示翻页按钮
if (StackPanelPPTControls.Visibility == Visibility.Visible && if (StackPanelPPTControls.Visibility == Visibility.Visible &&
BtnPPTSlideShowEnd.Visibility == Visibility.Visible && BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
PPTManager?.IsInSlideShow == true && PPTManager?.IsInSlideShow == true &&
PPTManager?.SlidesCount > 0) PPTManager?.SlidesCount > 0 &&
!Settings.Automation.IsAutoFoldInPPTSlideShow)
{ {
var dops = Settings.PowerPointSettings.PPTButtonsDisplayOption.ToString(); var dops = Settings.PowerPointSettings.PPTButtonsDisplayOption.ToString();
var dopsc = dops.ToCharArray(); var dopsc = dops.ToCharArray();
@@ -684,10 +684,12 @@ namespace Ink_Canvas
HideSubPanelsImmediately(); HideSubPanelsImmediately();
// 只有在PPT放映模式下且页数有效时才显示翻页按钮 // 只有在PPT放映模式下且页数有效时才显示翻页按钮
// 但是,如果启用了PPT自动收纳功能,则不显示翻页按钮
if (StackPanelPPTControls.Visibility == Visibility.Visible && if (StackPanelPPTControls.Visibility == Visibility.Visible &&
BtnPPTSlideShowEnd.Visibility == Visibility.Visible && BtnPPTSlideShowEnd.Visibility == Visibility.Visible &&
PPTManager?.IsInSlideShow == true && PPTManager?.IsInSlideShow == true &&
PPTManager?.SlidesCount > 0) PPTManager?.SlidesCount > 0 &&
!Settings.Automation.IsAutoFoldInPPTSlideShow)
{ {
var dops = Settings.PowerPointSettings.PPTButtonsDisplayOption.ToString(); var dops = Settings.PowerPointSettings.PPTButtonsDisplayOption.ToString();
var dopsc = dops.ToCharArray(); var dopsc = dops.ToCharArray();