This commit is contained in:
2025-09-06 15:28:14 +08:00
parent 111819dbf3
commit 3d54edf25b
2 changed files with 6 additions and 20 deletions
+1
View File
@@ -1618,6 +1618,7 @@ namespace Ink_Canvas
{ {
var settingsWindow = new SettingsWindow(); var settingsWindow = new SettingsWindow();
settingsWindow.Owner = this; settingsWindow.Owner = this;
settingsWindow.Topmost = true; // 确保设置窗口始终在主窗口之上,避免下拉框被遮挡
settingsWindow.ShowDialog(); settingsWindow.ShowDialog();
} }
} }
@@ -675,27 +675,12 @@ namespace Ink_Canvas
RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed; RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
LogHelper.WriteLogToFile($"隐藏PPT翻页按钮 - 放映状态: {PPTManager?.IsInSlideShow}, 页数: {PPTManager?.SlidesCount}", LogHelper.LogType.Trace); LogHelper.WriteLogToFile($"隐藏PPT翻页按钮 - 放映状态: {PPTManager?.IsInSlideShow}, 页数: {PPTManager?.SlidesCount}", LogHelper.LogType.Trace);
} }
// 修复PPT放映时点击白板按钮后翻页按钮不显示的问题
// 只有在确实在放映模式下且页数有效时才强制显示翻页按钮 // 使用PPT UI管理器来正确更新翻页按钮显示状态,确保遵循用户设置
if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible && if (_pptUIManager != null)
PPTManager?.IsInSlideShow == true &&
PPTManager?.SlidesCount > 0)
{ {
// 强制显示PPT翻页按钮 _pptUIManager.UpdateNavigationPanelsVisibility();
LeftBottomPanelForPPTNavigation.Visibility = Visibility.Visible; LogHelper.WriteLogToFile($"使用PPT UI管理器更新翻页按钮显示状态", LogHelper.LogType.Trace);
RightBottomPanelForPPTNavigation.Visibility = Visibility.Visible;
LeftSidePanelForPPTNavigation.Visibility = Visibility.Visible;
RightSidePanelForPPTNavigation.Visibility = Visibility.Visible;
LogHelper.WriteLogToFile($"强制显示PPT翻页按钮 - 放映状态: {PPTManager?.IsInSlideShow}, 页数: {PPTManager?.SlidesCount}", LogHelper.LogType.Trace);
}
else
{
// 如果条件不满足,确保隐藏翻页按钮
LeftBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
RightBottomPanelForPPTNavigation.Visibility = Visibility.Collapsed;
LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
LogHelper.WriteLogToFile($"隐藏PPT翻页按钮 - 放映状态: {PPTManager?.IsInSlideShow}, 页数: {PPTManager?.SlidesCount}", LogHelper.LogType.Trace);
} }
if (Settings.Automation.IsAutoSaveStrokesAtClear && if (Settings.Automation.IsAutoSaveStrokesAtClear &&