Refactor modifier config and default to Control

Author: emako

src/SecondaryClick/Gestures/Modifiers/ModifiersGestureRecognizer.cs

@@ -10,42 +10,42 @@ namespace SecondaryClick.Gestures.Modifiers;
 /// Allows users to trigger a right-click by holding modifier keys (Alt, Ctrl, Shift) and clicking the left mouse button.
 /// Uses a low-level mouse/keyboard hook to intercept and process user input.
 /// </summary>
-public sealed class ModifiersGestureRecognizer : IGestureRecognizer
+public sealed partial class ModifiersGestureRecognizer : IGestureRecognizer
 {
     /// <summary>
     /// Simulates keyboard and mouse input events.
     /// </summary>
     private readonly InputSimulator _simulator = new();
-    
+
     /// <summary>
     /// Low-level keyboard and mouse hook for global input capture.
     /// </summary>
     private IKeyboardMouseEvents? _hook;
-    
+
     /// <summary>
     /// Flag indicating whether a right mouse button down event has been injected by this recognizer.
     /// </summary>
     private bool _rightDownInjected;
-    
+
     /// <summary>
     /// Flag to prevent re-entrant input processing of injected events.
     /// </summary>
     private bool _suppressInjected;
-    
+
     /// <summary>
     /// Flag indicating whether this recognizer is currently enabled.
     /// </summary>
     private bool _enabled;
-    
+
     /// <summary>
     /// Flag indicating whether the Alt key should be suppressed from appearing as a key event.
     /// </summary>
     private bool _suppressAltKey;
-    
+
     /// <summary>
-    /// The modifier keys that must be held to activate the gesture (default: Alt).
+    /// The modifier keys that must be held to activate the gesture (default: Control).
     /// </summary>
-    private GestureModifiers _activationModifiers = GestureModifiers.Alt;
+    private GestureModifiers _activationModifiers = GestureModifiers.Control;
 
     /// <summary>
     /// Gets or sets the modifier keys that must be held to activate the secondary click gesture.

src/SecondaryClick/TrayIconManager.cs

@@ -49,27 +49,7 @@ private TrayIconManager()
     {
         _recognizerHolder = new();
         _isTrayIconHidden = Configurations.HideTrayIcon.Get();
-
-        if (Configurations.ModifiersAlt.Get())
-        {
-            _recognizerHolder.ModifiersRecognizer.ActivationModifiers
-                |= Gestures.Modifiers.GestureModifiers.Alt;
-        }
-        if (Configurations.ModifiersControl.Get())
-        {
-            _recognizerHolder.ModifiersRecognizer.ActivationModifiers
-                |= Gestures.Modifiers.GestureModifiers.Control;
-        }
-        if (Configurations.ModifiersShift.Get())
-        {
-            _recognizerHolder.ModifiersRecognizer.ActivationModifiers
-                |= Gestures.Modifiers.GestureModifiers.Shift;
-        }
-        _recognizerHolder.ModifiersRecognizer.SetEnabled(
-            Configurations.ModifiersAlt.Get()
-                | Configurations.ModifiersControl.Get()
-                | Configurations.ModifiersShift.Get()
-        );
+        ApplyModifierConfiguration();
 
         _icon = new TrayIconHost
         {
@@ -142,50 +122,40 @@ private TrayIconManager()
                                 Configurations.ModifiersAlt.Set(false);
                                 Configurations.ModifiersControl.Set(false);
                                 Configurations.ModifiersShift.Set(false);
-
-                                GetInstance()._recognizerHolder.ModifiersRecognizer.SetEnabled(false);
+                                GetInstance().ApplyModifierConfiguration();
                             },
                         },
                         new TrayMenuItem
                         {
                             Tag = nameof(SH.ModifiersAlt),
                             Header = SH.ModifiersAlt,
-                            IsChecked = true,
+                            IsChecked = Configurations.ModifiersAlt.Get(),
                             Command = static _ =>
                             {
                                 Configurations.ModifiersAlt.Set(!Configurations.ModifiersAlt.Get());
-
-                                GetInstance()._recognizerHolder.ModifiersRecognizer.ActivationModifiers
-                                    |= Gestures.Modifiers.GestureModifiers.Alt;
-                                GetInstance()._recognizerHolder.ModifiersRecognizer.SetEnabled(true);
+                                GetInstance().ApplyModifierConfiguration();
                             },
                         },
                         new TrayMenuItem
                         {
                             Tag = nameof(SH.ModifiersControl),
                             Header = SH.ModifiersControl,
-                            IsChecked = false,
+                            IsChecked = Configurations.ModifiersControl.Get(),
                             Command = static _ =>
                             {
                                 Configurations.ModifiersControl.Set(!Configurations.ModifiersControl.Get());
-
-                                GetInstance()._recognizerHolder.ModifiersRecognizer.ActivationModifiers
-                                    |= Gestures.Modifiers.GestureModifiers.Control;
-                                GetInstance()._recognizerHolder.ModifiersRecognizer.SetEnabled(true);
+                                GetInstance().ApplyModifierConfiguration();
                             },
                         },
                         new TrayMenuItem
                         {
                             Tag = nameof(SH.ModifiersShift),
                             Header = SH.ModifiersShift,
-                            IsChecked = false,
+                            IsChecked = Configurations.ModifiersShift.Get(),
                             Command = static _ =>
                             {
                                 Configurations.ModifiersShift.Set(!Configurations.ModifiersShift.Get());
-
-                                GetInstance()._recognizerHolder.ModifiersRecognizer.ActivationModifiers
-                                    |= Gestures.Modifiers.GestureModifiers.Shift;
-                                GetInstance()._recognizerHolder.ModifiersRecognizer.SetEnabled(true);
+                                GetInstance().ApplyModifierConfiguration();
                             },
                         },
                     ]
@@ -275,6 +245,31 @@ private void ApplyTrayIconVisibilityFromConfiguration()
         _icon.IsVisible = !_isTrayIconHidden;
     }
 
+    private void ApplyModifierConfiguration()
+    {
+        Gestures.Modifiers.GestureModifiers activationModifiers = Gestures.Modifiers.GestureModifiers.None;
+
+        if (Configurations.ModifiersAlt.Get())
+        {
+            activationModifiers |= Gestures.Modifiers.GestureModifiers.Alt;
+        }
+
+        if (Configurations.ModifiersControl.Get())
+        {
+            activationModifiers |= Gestures.Modifiers.GestureModifiers.Control;
+        }
+
+        if (Configurations.ModifiersShift.Get())
+        {
+            activationModifiers |= Gestures.Modifiers.GestureModifiers.Shift;
+        }
+
+        _recognizerHolder.ModifiersRecognizer.ActivationModifiers = activationModifiers;
+        _recognizerHolder.ModifiersRecognizer.SetEnabled(
+            activationModifiers != Gestures.Modifiers.GestureModifiers.None
+        );
+    }
+
     private void OnTrayIconVisibilityWatcherTick(object? sender, EventArgs e)
     {
         bool isHiddenInRegistry = Configurations.HideTrayIcon.Get();