From d8cfe0a4fde8e62d1467f7f1d1c76fda7e7090ae Mon Sep 17 00:00:00 2001
From: ChanginJolly <ChanginJolly@outlook.com>
Date: Thu, 2 May 2024 00:05:12 +0800
Subject: [PATCH] [fix] unexpected prompt for TwoFingerGestureBtn

---
 AutomaticUpdateVersionControl.txt             |  2 +-
 .../MainWindow_cs/MW_FloatingBarIcons.cs      | 24 +++++++++----------
 Ink Canvas/MainWindow_cs/MW_Settings.cs       |  2 +-
 Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs |  2 ++
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/AutomaticUpdateVersionControl.txt b/AutomaticUpdateVersionControl.txt
index d01c9f6..2733e92 100644
--- a/AutomaticUpdateVersionControl.txt
+++ b/AutomaticUpdateVersionControl.txt
@@ -1 +1 @@
-4.5.4
\ No newline at end of file
+4.5.6
\ No newline at end of file
diff --git a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs
index 9ede924..aae6208 100644
--- a/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_FloatingBarIcons.cs	
@@ -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);
diff --git a/Ink Canvas/MainWindow_cs/MW_Settings.cs b/Ink Canvas/MainWindow_cs/MW_Settings.cs
index 85eab9f..7f09cdd 100644
--- a/Ink Canvas/MainWindow_cs/MW_Settings.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_Settings.cs	
@@ -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 {
diff --git a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs
index aa4795b..a9b0c97 100644
--- a/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
+++ b/Ink Canvas/MainWindow_cs/MW_SettingsToLoad.cs	
@@ -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();