允许默认禁用双指手势

WXRIW · Jun 13, 2024 · 68be463 · 68be463
1 parent b5352a3
commit 68be463
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 13 deletions.
diff --git a/Ink Canvas/MainWindow.xaml b/Ink Canvas/MainWindow.xaml
@@ -440,6 +440,7 @@
                         </GroupBox>
                         <GroupBox Header="手势">
                             <ui:SimpleStackPanel Spacing="12">
+                                <ui:ToggleSwitch Name="ToggleSwitchDisableLockSmithByDefault" Header="默认启用双指手势" FontFamily="Microsoft YaHei UI" IsOn="True" OnContent="开" OffContent="关" Toggled="ToggleSwitchDisableLockSmithByDefault_Toggled"/>
                                 <ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerZoom" Header="允许双指缩放" FontFamily="Microsoft YaHei UI" IsOn="True" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerZoom_Toggled"/>
                                 <ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerTranslate" Header="允许双指移动" FontFamily="Microsoft YaHei UI" IsOn="True" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerTranslate_Toggled"/>
                                 <ui:ToggleSwitch Name="ToggleSwitchEnableTwoFingerRotation" Header="允许双指旋转" FontFamily="Microsoft YaHei UI" OnContent="开" OffContent="关" Toggled="ToggleSwitchEnableTwoFingerRotation_Toggled"/>

diff --git a/Ink Canvas/MainWindow.xaml.cs b/Ink Canvas/MainWindow.xaml.cs
@@ -925,8 +925,20 @@ private void LoadSettings(bool isStartup = true)
             if (Settings.Gesture == null)
             {
                 Settings.Gesture = new Gesture();
-            }
-            if (Settings.Gesture.IsEnableTwoFingerZoom)
+			}
+			if (Settings.Gesture.IsDisableLockSmithByDefault)
+            {
+				ToggleSwitchDisableLockSmithByDefault.IsOn = true;
+                _lockSmith = false;
+				LockSmithSymbol.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.Pin;
+			}
+            else
+            {
+				ToggleSwitchDisableLockSmithByDefault.IsOn = false;
+                _lockSmith = true;
+				LockSmithSymbol.Symbol = iNKORE.UI.WPF.Modern.Controls.Symbol.UnPin;
+			}
+			if (Settings.Gesture.IsEnableTwoFingerZoom)
             {
                 ToggleSwitchEnableTwoFingerZoom.IsOn = true;
             }
@@ -3295,18 +3307,25 @@ private void ToggleSwitchEnableFingerGestureSlideShowControl_Toggled(object send
             Settings.PowerPointSettings.IsEnableFingerGestureSlideShowControl = ToggleSwitchEnableFingerGestureSlideShowControl.IsOn;
 
             SaveSettingsToFile();
-        }
+		}
 
-        private void ToggleSwitchEnableTwoFingerZoom_Toggled(object sender, RoutedEventArgs e)
-        {
-            if (!isLoaded) return;
+		private void ToggleSwitchDisableLockSmithByDefault_Toggled(object sender, RoutedEventArgs e) {
+			if (!isLoaded) return;
 
-            Settings.Gesture.IsEnableTwoFingerZoom = ToggleSwitchEnableTwoFingerZoom.IsOn;
+			Settings.Gesture.IsDisableLockSmithByDefault = ToggleSwitchDisableLockSmithByDefault.IsOn;
 
-            SaveSettingsToFile();
-        }
+			SaveSettingsToFile();
+		}
+
+		private void ToggleSwitchEnableTwoFingerZoom_Toggled(object sender, RoutedEventArgs e) {
+			if (!isLoaded) return;
+
+			Settings.Gesture.IsEnableTwoFingerZoom = ToggleSwitchEnableTwoFingerZoom.IsOn;
+
+			SaveSettingsToFile();
+		}
 
-        private void ToggleSwitchEnableTwoFingerTranslate_Toggled(object sender, RoutedEventArgs e)
+		private void ToggleSwitchEnableTwoFingerTranslate_Toggled(object sender, RoutedEventArgs e)
         {
             if (!isLoaded) return;
 

diff --git a/Ink Canvas/Settings.cs b/Ink Canvas/Settings.cs
@@ -55,9 +55,11 @@ public class Gesture
     {
         [JsonIgnore]
         public bool IsEnableTwoFingerGesture => IsEnableTwoFingerZoom || IsEnableTwoFingerTranslate || IsEnableTwoFingerRotation;
-        [JsonProperty("isEnableTwoFingerZoom")]
-        public bool IsEnableTwoFingerZoom { get; set; } = true;
-        [JsonProperty("isEnableTwoFingerTranslate")]
+		[JsonProperty("isDisableLockSmithByDefault")]
+		public bool IsDisableLockSmithByDefault { get; set; } = true;
+		[JsonProperty("isEnableTwoFingerZoom")]
+		public bool IsEnableTwoFingerZoom { get; set; } = true;
+		[JsonProperty("isEnableTwoFingerTranslate")]
         public bool IsEnableTwoFingerTranslate { get; set; } = true;
         [JsonProperty("isEnableTwoFingerRotation")]
         public bool IsEnableTwoFingerRotation { get; set; } = false;