improve:PPT翻页打断

改进打断逻辑
2025-12-20 18:42:25 +08:00
parent f3ddd5a11a
commit ddfa9c2676
2 changed files with 23 additions and 24 deletions
@@ -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;
            }