From 8719677f11f76915a04501b1a1703b60db6c23cf Mon Sep 17 00:00:00 2001 From: CJKmkp <2564608840@qq.com> Date: Sat, 23 Aug 2025 18:55:36 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=BC=80=E5=90=AF=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=90=8E=E6=89=8B=E5=8A=BF=E9=9D=A2=E6=9D=BF?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ink Canvas/MainWindow_cs/MW_Colors.cs | 4 ++++ Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs | 8 ++++++++ Ink Canvas/MainWindow_cs/MW_PPT.cs | 11 +++++++++++ 3 files changed, 23 insertions(+) diff --git a/Ink Canvas/MainWindow_cs/MW_Colors.cs b/Ink Canvas/MainWindow_cs/MW_Colors.cs index 4c003865..fdd0b1ea 100644 --- a/Ink Canvas/MainWindow_cs/MW_Colors.cs +++ b/Ink Canvas/MainWindow_cs/MW_Colors.cs @@ -28,6 +28,10 @@ namespace Ink_Canvas AnimationsHelper.HideWithSlideAndFade(BlackboardLeftSide); AnimationsHelper.HideWithSlideAndFade(BlackboardCenterSide); AnimationsHelper.HideWithSlideAndFade(BlackboardRightSide); + + // 在PPT模式下隐藏手势面板 + AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); } BtnHideInkCanvas_Click(BtnHideInkCanvas, null); diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs index eae5db73..0a17d259 100644 --- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs +++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs @@ -2472,6 +2472,10 @@ namespace Ink_Canvas DeselectUIElement(); + // 在PPT模式下隐藏手势面板 + AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); + SaveStrokes(true); ClearStrokes(true); RestoreStrokes(true); @@ -2517,6 +2521,10 @@ namespace Ink_Canvas // 取消任何UI元素的选择 DeselectUIElement(); + // 在PPT模式下隐藏手势面板 + AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); + SaveStrokes(); ClearStrokes(true); RestoreStrokes(true); diff --git a/Ink Canvas/MainWindow_cs/MW_PPT.cs b/Ink Canvas/MainWindow_cs/MW_PPT.cs index 452f3f8b..50cf5edf 100644 --- a/Ink Canvas/MainWindow_cs/MW_PPT.cs +++ b/Ink Canvas/MainWindow_cs/MW_PPT.cs @@ -292,6 +292,10 @@ namespace Ink_Canvas BorderFloatingBarMainControls.Visibility = Visibility.Visible; + // 在PPT模式下隐藏手势面板 + AnimationsHelper.HideWithSlideAndFade(TwoFingerGestureBorder); + AnimationsHelper.HideWithSlideAndFade(BoardTwoFingerGestureBorder); + if (Settings.PowerPointSettings.IsShowCanvasAtNewSlideShow && !Settings.Automation.IsAutoFoldInPPTSlideShow) BtnColorRed_Click(null, null); @@ -394,6 +398,13 @@ namespace Ink_Canvas // 注意：这里只清空索引0的备份，不影响白板页面的墨迹（索引1及以上） TimeMachineHistories[0] = null; + // 退出PPT模式时恢复手势面板的显示状态 + if (Settings.Gesture.IsEnableTwoFingerGesture && ToggleSwitchEnableMultiTouchMode.IsOn) + { + // 根据手势设置决定是否显示手势面板 + CheckEnableTwoFingerGestureBtnVisibility(true); + } + if (GridTransparencyFakeBackground.Background != Brushes.Transparent) BtnHideInkCanvas_Click(BtnHideInkCanvas, null); }