Revert "improve:PPT翻页打断"

This reverts commit ddfa9c2676.
2026-01-10 17:23:40 +08:00
parent e2c222a156
commit ec579288a8
2 changed files with 24 additions and 23 deletions
@@ -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;
            }