fix:浮动栏收纳
This commit is contained in:
@@ -870,7 +870,7 @@ namespace Ink_Canvas
|
||||
try
|
||||
{
|
||||
// PPT退出时自动收纳浮动栏
|
||||
if (!isFloatingBarFolded)
|
||||
if (Settings.Automation.IsAutoFoldAfterPPTSlideShow && !isFloatingBarFolded)
|
||||
{
|
||||
FoldFloatingBar_MouseUp(new object(), null);
|
||||
}
|
||||
@@ -973,9 +973,16 @@ namespace Ink_Canvas
|
||||
|
||||
await Task.Delay(100);
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
if (Settings.Automation.IsAutoFoldAfterPPTSlideShow)
|
||||
{
|
||||
PureViewboxFloatingBarMarginAnimationInDesktopMode();
|
||||
ViewboxFloatingBarMarginAnimation(-60);
|
||||
}
|
||||
else
|
||||
{
|
||||
PureViewboxFloatingBarMarginAnimationInDesktopMode();
|
||||
}
|
||||
});
|
||||
}
|
||||
catch (Exception ex)
|
||||
@@ -1745,9 +1752,16 @@ namespace Ink_Canvas
|
||||
SetCurrentToolMode(InkCanvasEditingMode.None);
|
||||
|
||||
await Task.Delay(150);
|
||||
// PPT退出时自动收纳,使用收纳状态的边距动画
|
||||
|
||||
if (Settings.Automation.IsAutoFoldAfterPPTSlideShow)
|
||||
{
|
||||
ViewboxFloatingBarMarginAnimation(-60);
|
||||
}
|
||||
else
|
||||
{
|
||||
ViewboxFloatingBarMarginAnimation(100, true);
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogHelper.WriteLogToFile($"结束PPT放映操作异常: {ex}", LogHelper.LogType.Error);
|
||||
@@ -1762,10 +1776,16 @@ namespace Ink_Canvas
|
||||
// 异常情况下也手动处理自动收纳
|
||||
await HandleManualSlideShowEnd();
|
||||
|
||||
// 异常情况下也要自动收纳,使用收纳状态的边距动画
|
||||
await Task.Delay(150);
|
||||
if (Settings.Automation.IsAutoFoldAfterPPTSlideShow)
|
||||
{
|
||||
ViewboxFloatingBarMarginAnimation(-60);
|
||||
}
|
||||
else
|
||||
{
|
||||
ViewboxFloatingBarMarginAnimation(100, true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -1776,7 +1796,7 @@ namespace Ink_Canvas
|
||||
try
|
||||
{
|
||||
// PPT退出时自动收纳浮动栏
|
||||
if (!isFloatingBarFolded)
|
||||
if (Settings.Automation.IsAutoFoldAfterPPTSlideShow && !isFloatingBarFolded)
|
||||
{
|
||||
FoldFloatingBar_MouseUp(new object(), null);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user