This commit is contained in:
2025-09-07 00:20:48 +08:00
parent a725a12d25
commit 8c1d3c0248
2 changed files with 18 additions and 5 deletions
+7 -1
View File
@@ -2178,7 +2178,7 @@ namespace Ink_Canvas
{ {
if (Settings.PowerPointSettings.ShowGestureButtonInSlideShow) if (Settings.PowerPointSettings.ShowGestureButtonInSlideShow)
{ {
// 如果启用了PPT放映模式显示手势按钮,则显示手势按钮(在PPT模式下不依赖手势功能是否启用) // 如果启用了PPT放映模式显示手势按钮,则检查是否在批注模式下显示手势按钮
CheckEnableTwoFingerGestureBtnVisibility(true); CheckEnableTwoFingerGestureBtnVisibility(true);
} }
else else
@@ -2322,6 +2322,12 @@ namespace Ink_Canvas
_globalHotkeyManager.UpdateHotkeyStateForToolMode(isMouseMode); _globalHotkeyManager.UpdateHotkeyStateForToolMode(isMouseMode);
} }
// 在PPT放映模式下,工具模式切换时需要更新手势按钮的显示状态
if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
{
UpdateGestureButtonVisibilityInPPTMode();
}
// 执行额外的操作(如果有) // 执行额外的操作(如果有)
additionalActions?.Invoke(); additionalActions?.Invoke();
@@ -130,11 +130,11 @@ namespace Ink_Canvas
/// </summary> /// </summary>
private void CheckEnableTwoFingerGestureBtnVisibility(bool isVisible) private void CheckEnableTwoFingerGestureBtnVisibility(bool isVisible)
{ {
// 在PPT模式下根据设置决定是否显示手势按钮 // 在PPT放映模式下根据设置决定是否显示手势按钮
if (currentMode == 0 || BtnPPTSlideShowEnd.Visibility == Visibility.Visible) if (BtnPPTSlideShowEnd.Visibility == Visibility.Visible)
{ {
// 如果启用了PPT放映模式显示手势按钮,则显示手势按钮(在PPT模式下不依赖手势功能是否启用) // 如果启用了PPT放映模式显示手势按钮,且当前处于批注模式,则显示手势按钮
if (Settings.PowerPointSettings.ShowGestureButtonInSlideShow && isVisible) if (Settings.PowerPointSettings.ShowGestureButtonInSlideShow && isVisible && inkCanvas.EditingMode == InkCanvasEditingMode.Ink)
{ {
EnableTwoFingerGestureBorder.Visibility = Visibility.Visible; EnableTwoFingerGestureBorder.Visibility = Visibility.Visible;
} }
@@ -145,6 +145,13 @@ namespace Ink_Canvas
return; return;
} }
// 在屏幕模式(非放映模式)下,不显示手势按钮
if (currentMode == 0)
{
EnableTwoFingerGestureBorder.Visibility = Visibility.Collapsed;
return;
}
if (StackPanelCanvasControls.Visibility != Visibility.Visible if (StackPanelCanvasControls.Visibility != Visibility.Visible
|| BorderFloatingBarMainControls.Visibility != Visibility.Visible) || BorderFloatingBarMainControls.Visibility != Visibility.Visible)
{ {