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