Allow selecting control by clicking edit and hotkey buttons

MrGongqi · Jul 31, 2022 · 93cb759 · 93cb759
1 parent e134ae1
commit 93cb759
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/ShareX/Controls/HotkeySelectionControl.Designer.cs b/ShareX/Controls/HotkeySelectionControl.Designer.cs
diff --git a/ShareX/Controls/HotkeySelectionControl.cs b/ShareX/Controls/HotkeySelectionControl.cs
@@ -219,6 +219,12 @@ private void StopEditing()
             UpdateHotkeyStatus();
         }
 
+        private void SelectControl()
+        {
+            Selected = true;
+            OnSelectedChanged();
+        }
+
         protected void OnHotkeyChanged()
         {
             HotkeyChanged?.Invoke(this, EventArgs.Empty);
@@ -234,17 +240,14 @@ protected void OnEditRequested()
             EditRequested?.Invoke(this, EventArgs.Empty);
         }
 
-        private void btnTask_MouseClick(object sender, MouseEventArgs e)
+        private void btnTask_Click(object sender, EventArgs e)
         {
-            if (e.Button == MouseButtons.Left)
-            {
-                Selected = true;
-                OnSelectedChanged();
-            }
+            SelectControl();
         }
 
         private void btnEdit_Click(object sender, EventArgs e)
         {
+            SelectControl();
             OnEditRequested();
         }
 
@@ -309,6 +312,7 @@ private void btnHotkey_MouseClick(object sender, MouseEventArgs e)
             }
             else
             {
+                SelectControl();
                 StartEditing();
             }
         }

diff --git a/ShareX/Controls/HotkeySelectionControl.resx b/ShareX/Controls/HotkeySelectionControl.resx
@@ -214,7 +214,7 @@
     <value>219, 27</value>
   </data>
   <data name="btnHotkey.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>2</value>
   </data>
   <data name="btnHotkey.Text" xml:space="preserve">
     <value>Hotkey</value>