Fix KeyUp event to KeyDown in order to handle commit action

RauulDev · Feb 24, 2023 · b8d175c · b8d175c
1 parent fc704e2
commit b8d175c
Showing 1 changed file with 3 additions and 11 deletions.
diff --git a/GitUI/CommandsDialogs/FormCommit.cs b/GitUI/CommandsDialogs/FormCommit.cs
@@ -863,7 +863,7 @@ protected override CommandStatus ExecuteCommand(int cmd)
                 case Command.Refresh: RescanChanges(); return true;
                 case Command.SelectNext:
                 case Command.SelectNext_AlternativeHotkey1:
-                case Command.SelectNext_AlternativeHotkey2: MoveSelection(1);  return true;
+                case Command.SelectNext_AlternativeHotkey2: MoveSelection(1); return true;
                 case Command.SelectPrevious:
                 case Command.SelectPrevious_AlternativeHotkey1:
                 case Command.SelectPrevious_AlternativeHotkey2: MoveSelection(-1); return true;
@@ -2804,16 +2804,6 @@ private void ViewFileHistoryMenuItem_Click(object sender, EventArgs e)
             }
         }
 
-        private void Message_KeyUp(object sender, KeyEventArgs e)
-        {
-            // Ctrl + Enter = Commit
-            if (e.Control && e.KeyCode == Keys.Enter)
-            {
-                ExecuteCommitCommand();
-                e.Handled = true;
-            }
-        }
-
         private void ExecuteCommitCommand()
         {
             CheckForStagedAndCommit(amend: Amend.Checked, push: false, resetAuthor: Amend.Checked && ResetAuthor.Checked);
@@ -2822,8 +2812,10 @@ private void ExecuteCommitCommand()
         private void Message_KeyDown(object sender, KeyEventArgs e)
         {
             // Prevent adding a line break when all we want is to commit
+            // Ctrl + Enter = Commit
             if (e.Control && e.KeyCode == Keys.Enter)
             {
+                ExecuteCommitCommand();
                 e.Handled = true;
             }
         }