kriastans/InkCanvasForClass
kriastans/InkCanvasForClass
1
Fork 0
Code Issues 1 Actions Projects 1 Releases Wiki Activity

[fix] unexpected prompt for TwoFingerGestureBtn

Browse Source
This commit is contained in:
ChanginJolly 2024-05-02 00:05:12 +08:00
parent f7ad4007f0
commit d8cfe0a4fd
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AutomaticUpdateVersionControl.txt
View File

@ -1 +1 @@
4.5.4
4.5.6

24
Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
View File

@ -290,13 +290,7 @@ namespace Ink_Canvas {
BottomViewboxPPTSidesControl.Visibility = Visibility.Collapsed;
LeftSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
RightSidePanelForPPTNavigation.Visibility = Visibility.Collapsed;
//进入黑板
if (Settings.Gesture.AutoSwitchTwoFingerGesture) // 自动关闭多指书写、开启双指移动
{
if (isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = false;
ToggleSwitchEnableTwoFingerTranslate.IsOn = true;
}
/*
if (Not_Enter_Blackboard_fir_Mouse_Click) {// BUG-Fixed_tmp：程序启动后直接进入白板会导致后续撤销功能、退出白板无法恢复墨迹
@ -319,6 +313,12 @@ namespace Ink_Canvas {
} else {
BorderPenColorWhite_MouseUp(BorderPenColorWhite, null);
}
if (Settings.Gesture.AutoSwitchTwoFingerGesture) // 自动关闭多指书写、开启双指移动
{
ToggleSwitchEnableTwoFingerTranslate.IsOn = true;
if (isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = false;
}
} else {
//关闭黑板
HideSubPanelsImmediately();
@ -333,12 +333,6 @@ namespace Ink_Canvas {
}
}
if (Settings.Gesture.AutoSwitchTwoFingerGesture) // 自动启用多指书写
{
ToggleSwitchEnableTwoFingerTranslate.IsOn = false;
if (!isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = true;
}
if (Settings.Automation.IsAutoSaveStrokesAtClear && inkCanvas.Strokes.Count > Settings.Automation.MinimumAutomationStrokeNumber) {
SaveScreenShot(true);
}
@ -361,6 +355,12 @@ namespace Ink_Canvas {
if (Pen_Icon.Background == null) {
PenIcon_Click(null, null);
}
if (Settings.Gesture.AutoSwitchTwoFingerGesture) // 自动启用多指书写
{
ToggleSwitchEnableTwoFingerTranslate.IsOn = false;
if (!isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = true;
}
}
BtnSwitch_Click(BtnSwitch, null);

2
Ink Canvas/MainWindow_cs/MW_Settings.cs
View File

@ -449,7 +449,7 @@ namespace Ink_Canvas {
}
private void ToggleSwitchEnableMultiTouchMode_Toggled(object sender, RoutedEventArgs e) {
if (!isLoaded) return;
//if (!isLoaded) return;
if (sender == ToggleSwitchEnableMultiTouchMode) {
BoardToggleSwitchEnableMultiTouchMode.IsOn = ToggleSwitchEnableMultiTouchMode.IsOn;
} else {

2
Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
View File

@ -258,10 +258,12 @@ namespace Ink_Canvas {
ToggleSwitchEnableTwoFingerTranslate.IsOn = false;
BoardToggleSwitchEnableTwoFingerTranslate.IsOn = false;
Settings.Gesture.IsEnableTwoFingerTranslate = false;
if (!isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = true;
} else {
ToggleSwitchEnableTwoFingerTranslate.IsOn = true;
BoardToggleSwitchEnableTwoFingerTranslate.IsOn = true;
Settings.Gesture.IsEnableTwoFingerTranslate = true;
if (isInMultiTouchMode) ToggleSwitchEnableMultiTouchMode.IsOn = false;
}
}
CheckEnableTwoFingerGestureBtnColorPrompt();