diff --git a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs index b7e0c003..8c3298b7 100644 --- a/Ink Canvas/MainWindow_cs/MW_AutoFold.cs +++ b/Ink Canvas/MainWindow_cs/MW_AutoFold.cs @@ -63,6 +63,8 @@ namespace Ink_Canvas foldFloatingBarByUser = true; unfoldFloatingBarByUser = false; + if (isFloatingBarFolded) return; + if (isFloatingBarChangingHideMode) return; await Dispatcher.InvokeAsync(() => diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs index 035bf903..307607b3 100644 --- a/Ink Canvas/MainWindow_cs/MW_PPT.cs +++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs @@ -921,16 +921,22 @@ namespace Ink_Canvas await Task.Delay(100); await Application.Current.Dispatcher.InvokeAsync(() => { - PureViewboxFloatingBarMarginAnimationInDesktopMode(); - if (Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode) + if (!isFloatingBarFolded) { - Task.Delay(350).ContinueWith(_ => + PureViewboxFloatingBarMarginAnimationInDesktopMode(); + if (Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode) { - Application.Current.Dispatcher.Invoke(() => + Task.Delay(350).ContinueWith(_ => { - ViewboxFloatingBarMarginAnimation(-60); + Application.Current.Dispatcher.Invoke(() => + { + if (!isFloatingBarFolded) + { + ViewboxFloatingBarMarginAnimation(-60); + } + }); }); - }); + } } }); } @@ -1647,11 +1653,17 @@ namespace Ink_Canvas SetCurrentToolMode(InkCanvasEditingMode.None); await Task.Delay(150); - PureViewboxFloatingBarMarginAnimationInDesktopMode(); - if (Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode) - { - await Task.Delay(350); - ViewboxFloatingBarMarginAnimation(-60); + if (!isFloatingBarFolded) + { + PureViewboxFloatingBarMarginAnimationInDesktopMode(); + if (Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode) + { + await Task.Delay(350); + if (!isFloatingBarFolded) + { + ViewboxFloatingBarMarginAnimation(-60); + } + } } } catch (Exception ex) @@ -1669,11 +1681,17 @@ namespace Ink_Canvas await HandleManualSlideShowEnd(); await Task.Delay(150); - PureViewboxFloatingBarMarginAnimationInDesktopMode(); - if (Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode) + if (!isFloatingBarFolded) { - await Task.Delay(350); - ViewboxFloatingBarMarginAnimation(-60); + PureViewboxFloatingBarMarginAnimationInDesktopMode(); + if (Settings.Automation.IsAutoEnterAnnotationModeWhenExitFoldMode) + { + await Task.Delay(350); + if (!isFloatingBarFolded) + { + ViewboxFloatingBarMarginAnimation(-60); + } + } } } }