This commit is contained in:
2026-01-17 20:05:33 +08:00
parent a6357abc15
commit 9c611698c7
+15 -21
View File
@@ -1628,31 +1628,25 @@ namespace Ink_Canvas
}); });
} }
// 结束放映 Application.Current.Dispatcher.Invoke(() =>
if (_pptManager?.TryEndSlideShow() == true)
{ {
// 如果成功结束放映,等待OnPPTSlideShowEnd事件处理收纳状态恢复 CursorIcon_Click(null, null);
}
else
{
LogHelper.WriteLogToFile("结束幻灯片放映失败", LogHelper.LogType.Warning);
// 手动更新UI状态,防止事件未触发
await Application.Current.Dispatcher.InvokeAsync(() =>
{
_pptUIManager?.UpdateSlideShowStatus(false);
_pptUIManager?.UpdateSidebarExitButtons(false);
LogHelper.WriteLogToFile("手动更新放映结束UI状态", LogHelper.LogType.Trace);
}); });
// 手动处理自动收纳,因为OnPPTSlideShowEnd事件可能未触发 await Task.Delay(100);
await HandleManualSlideShowEnd(); await Application.Current.Dispatcher.InvokeAsync(() => { }, System.Windows.Threading.DispatcherPriority.Background);
Application.Current.Dispatcher.BeginInvoke(new Action(() =>
{
try
{
_pptManager?.TryEndSlideShow();
} }
catch (Exception ex)
HideSubPanels("cursor"); {
SetCurrentToolMode(InkCanvasEditingMode.None); LogHelper.WriteLogToFile($"结束放映时发生异常: {ex}", LogHelper.LogType.Error);
}
await Task.Delay(150); }), System.Windows.Threading.DispatcherPriority.Normal);
if (!isFloatingBarFolded) if (!isFloatingBarFolded)
{ {
PureViewboxFloatingBarMarginAnimationInDesktopMode(); PureViewboxFloatingBarMarginAnimationInDesktopMode();