diff --git a/Ink Canvas/Helpers/PPTManager.cs b/Ink Canvas/Helpers/PPTManager.cs index fd9686e5..54b668db 100644 --- a/Ink Canvas/Helpers/PPTManager.cs +++ b/Ink Canvas/Helpers/PPTManager.cs @@ -744,40 +744,41 @@ namespace Ink_Canvas.Helpers { } - if (skipAnimations && currentPosition > 0 && totalSlides > 0 && currentPosition < totalSlides) + try { + view.Next(); + } + catch (Exception ex) + { + LogHelper.WriteLogToFile($"调用下一页失败: {ex}", LogHelper.LogType.Warning); + } + + if (skipAnimations && currentPosition > 0 && totalSlides > 0) + { + int positionAfterNext = currentPosition; try { - view.GotoSlide(currentPosition + 1, MsoTriState.msoFalse); - return true; + positionAfterNext = view.CurrentShowPosition; } - catch (Exception ex) + catch + { + } + + if (positionAfterNext == currentPosition && currentPosition < totalSlides) { - LogHelper.WriteLogToFile($"跳过转场动画跳转到下一页失败: {ex}", LogHelper.LogType.Warning); try { - view.Next(); + view.GotoSlide(currentPosition + 1, MsoTriState.msoTrue); return true; } - catch + catch (Exception ex) { - return false; + LogHelper.WriteLogToFile($"强制跳转到下一页失败: {ex}", LogHelper.LogType.Warning); } } } - else - { - try - { - view.Next(); - return true; - } - catch (Exception ex) - { - LogHelper.WriteLogToFile($"调用下一页失败: {ex}", LogHelper.LogType.Warning); - return false; - } - } + + return true; } return false; } diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml index b8898875..b72cb5af 100644 --- a/Ink Canvas/MainWindow.xaml +++ b/Ink Canvas/MainWindow.xaml @@ -2251,7 +2251,7 @@ TextWrapping="Wrap" Foreground="#a1a1aa" /> -