From ec579288a80a3a5b336574d79091e9c045c8b47e Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 10 Jan 2026 17:23:40 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"improve:PPT=E7=BF=BB=E9=A1=B5?=
=?UTF-8?q?=E6=89=93=E6=96=AD"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit ddfa9c2676b765ac31664b90263923f5220bd649.
---
Ink Canvas/Helpers/PPTManager.cs | 43 ++++++++++++++++----------------
Ink Canvas/MainWindow.xaml | 4 +--
2 files changed, 24 insertions(+), 23 deletions(-)
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" />
-