CJKmkp/community
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "improve:PPT翻页打断"

Browse Source 
This reverts commit ddfa9c2676.
This commit is contained in:
CJKmkp
2026-01-10 17:23:40 +08:00
parent e2c222a156
commit ec579288a8
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ink Canvas/Helpers/PPTManager.cs
+22 -21
View File
@@ -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;
}
Ink Canvas/MainWindow.xaml
+2 -2
View File
@@ -2251,7 +2251,7 @@
TextWrapping="Wrap" Foreground="#a1a1aa" />
<ui:SimpleStackPanel Orientation="Horizontal"
HorizontalAlignment="Left" Margin="0,6,0,0">
<TextBlock Foreground="#fafafa" Text="点击翻页时跳过转场动画，直接切到下一张"
<TextBlock Foreground="#fafafa" Text="点击翻页时跳过当前页动画，直接切到下一张"
VerticalAlignment="Center" FontSize="14" Margin="0,0,16,0" />
<ui:ToggleSwitch OnContent="" OffContent=""
Name="ToggleSwitchSkipAnimationsWhenGoNext"
@@ -2260,7 +2260,7 @@
Toggled="ToggleSwitchSkipAnimationsWhenGoNext_OnToggled" />
</ui:SimpleStackPanel>
<TextBlock
Text="# 开启该选项后，点击下一页按钮时会跳过幻灯片之间的转场动画，直接跳转到下一张幻灯片。不会影响幻灯片内的元素动画。"
Text="# 开启该选项后，点击“下一页”按钮时如果仍停留在同一页，会强制直接切到下一张幻灯片，从而跳过该页的动画。"
TextWrapping="Wrap" Foreground="#a1a1aa" />
</ui:SimpleStackPanel>
<Line HorizontalAlignment="Center" X1="0" Y1="0" X2="400" Y2="0" Stroke="#3f3f46"