diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index 6a31739c..d27e7bb7 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -3082,10 +3082,7 @@ namespace Ink_Canvas await Task.Delay(700); await Dispatcher.InvokeAsync(() => { - if (_pptManager?.IsInSlideShow != true) - { - FoldFloatingBar_MouseUp(new object(), null); - } + FoldFloatingBar_MouseUp(new object(), null); }); }); } diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs index 666b492e..352052cc 100644 --- a/Ink Canvas/MainWindow_cs/MW_PPT.cs +++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs @@ -730,7 +730,7 @@ namespace Ink_Canvas if (Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow && !Settings.Automation.IsAutoFoldInPPTSlideShow) { - await Task.Delay(300); + await Task.Delay(600); // 先进入批注模式,这会显示调色盘 PenIcon_Click(null, null); // 然后设置颜色 @@ -771,48 +771,17 @@ namespace Ink_Canvas LoadCurrentSlideInk(currentSlide); }); + if (!isFloatingBarFolded) { - _ = Task.Run(async () => + new Thread(() => { - try + Thread.Sleep(100); + Application.Current.Dispatcher.Invoke(() => { - await Task.Delay(100); - - await Application.Current.Dispatcher.InvokeAsync(() => - { - ViewboxFloatingBar.UpdateLayout(); - - // 如果浮动栏宽度仍未计算好,再等待一段时间 - if (ViewboxFloatingBar.ActualWidth <= 0) - { - LogHelper.WriteLogToFile("浮动栏宽度未准备好,等待布局完成", LogHelper.LogType.Trace); - } - }); - - await Task.Delay(100); - - await Application.Current.Dispatcher.InvokeAsync(() => - { - PureViewboxFloatingBarMarginAnimationInPPTMode(false); - }); - } - catch (Exception) - { - - try - { - await Task.Delay(100); - await Application.Current.Dispatcher.InvokeAsync(() => - { - ViewboxFloatingBarMarginAnimation(60); - }); - } - catch (Exception) - { - } - } - }); + ViewboxFloatingBarMarginAnimation(60); + }); + }).Start(); } } catch (Exception)