From ddfa9c2676b765ac31664b90263923f5220bd649 Mon Sep 17 00:00:00 2001
From: CJKmkp <2564608840@qq.com>
Date: Sat, 20 Dec 2025 18:42:25 +0800
Subject: [PATCH] =?UTF-8?q?improve:PPT=E7=BF=BB=E9=A1=B5=E6=89=93=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
改进打断逻辑
---
Ink Canvas/Helpers/PPTManager.cs | 43 ++++++++++++++++----------------
Ink Canvas/MainWindow.xaml | 4 +--
2 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/Ink Canvas/Helpers/PPTManager.cs b/Ink Canvas/Helpers/PPTManager.cs
index a104508e..b4f1198b 100644
--- a/Ink Canvas/Helpers/PPTManager.cs
+++ b/Ink Canvas/Helpers/PPTManager.cs
@@ -744,41 +744,40 @@ namespace Ink_Canvas.Helpers
{
}
- try
+ if (skipAnimations && currentPosition > 0 && totalSlides > 0 && currentPosition < totalSlides)
{
- view.Next();
- }
- catch (Exception ex)
- {
- LogHelper.WriteLogToFile($"调用下一页失败: {ex}", LogHelper.LogType.Warning);
- }
-
- if (skipAnimations && currentPosition > 0 && totalSlides > 0)
- {
- int positionAfterNext = currentPosition;
try
{
- positionAfterNext = view.CurrentShowPosition;
+ view.GotoSlide(currentPosition + 1, MsoTriState.msoFalse);
+ return true;
}
- catch
- {
- }
-
- if (positionAfterNext == currentPosition && currentPosition < totalSlides)
+ catch (Exception ex)
{
+ LogHelper.WriteLogToFile($"跳过转场动画跳转到下一页失败: {ex}", LogHelper.LogType.Warning);
try
{
- view.GotoSlide(currentPosition + 1, MsoTriState.msoTrue);
+ view.Next();
return true;
}
- catch (Exception ex)
+ catch
{
- LogHelper.WriteLogToFile($"强制跳转到下一页失败: {ex}", LogHelper.LogType.Warning);
+ return false;
}
}
}
-
- return true;
+ else
+ {
+ try
+ {
+ view.Next();
+ return true;
+ }
+ catch (Exception ex)
+ {
+ LogHelper.WriteLogToFile($"调用下一页失败: {ex}", LogHelper.LogType.Warning);
+ return false;
+ }
+ }
}
return false;
}
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
index efa9ab00..1995ece2 100644
--- a/Ink Canvas/MainWindow.xaml
+++ b/Ink Canvas/MainWindow.xaml
@@ -1946,7 +1946,7 @@
TextWrapping="Wrap" Foreground="#a1a1aa" />
-