improve:PPT自动播放及记忆上次播放页码
改进弹窗出现时机
This commit is contained in:
@@ -524,6 +524,8 @@ namespace Ink_Canvas
|
||||
{
|
||||
try
|
||||
{
|
||||
bool isInSlideShowWhenOpened = _pptManager?.IsInSlideShow == true;
|
||||
|
||||
Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
// 在初始化墨迹管理器之前,先清理画布上的所有墨迹
|
||||
@@ -546,8 +548,7 @@ namespace Ink_Canvas
|
||||
CheckAndNotifyHiddenSlides(pres);
|
||||
}
|
||||
|
||||
// 检查自动播放设置
|
||||
if (Settings.PowerPointSettings.IsNotifyAutoPlayPresentation)
|
||||
if (Settings.PowerPointSettings.IsNotifyAutoPlayPresentation && !isInSlideShowWhenOpened)
|
||||
{
|
||||
CheckAndNotifyAutoPlaySettings(pres);
|
||||
}
|
||||
@@ -1021,10 +1022,13 @@ namespace Ink_Canvas
|
||||
_pptManager?.TryNavigateToSlide(1);
|
||||
}
|
||||
else if (Settings.PowerPointSettings.IsNotifyPreviousPage)
|
||||
{
|
||||
if (_pptManager?.IsInSlideShow != true)
|
||||
{
|
||||
ShowPreviousPageNotification(pres);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
LogHelper.WriteLogToFile($"处理演示文稿导航失败: {ex}", LogHelper.LogType.Error);
|
||||
@@ -1134,7 +1138,7 @@ namespace Ink_Canvas
|
||||
{
|
||||
try
|
||||
{
|
||||
if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible) return;
|
||||
if (_pptManager?.IsInSlideShow == true) return;
|
||||
|
||||
bool hasSlideTimings = false;
|
||||
if (pres?.Slides != null)
|
||||
|
||||
Reference in New Issue
Block a user