Merge pull request #279 from gui-cs/delete-fix

Delete keybinding fix
gui-cs · Jan 1, 2024 · 71c25d5 · 71c25d5
2 parents d187bdc + 4f182c7
commit 71c25d5
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 7 deletions.
diff --git a/src/Keys.yaml b/src/Keys.yaml
@@ -8,7 +8,7 @@ Open: Ctrl+O
 Save: Ctrl+S
 Redo: Ctrl+Y
 Undo: Ctrl+Z
-Delete: Delete
+Delete: DeleteChar
 ToggleDragging: F3
 AddView: F2
 ToggleShowFocused: Ctrl+L

diff --git a/src/UI/Editor.cs b/src/UI/Editor.cs
@@ -120,7 +120,7 @@ public void Run(Options options)
             }
         }
 
-        Application.KeyUp += (_, k) =>
+        Application.KeyDown += (_, k) =>
         {
             if (this.editing)
             {

diff --git a/src/UI/KeyMap.cs b/src/UI/KeyMap.cs
@@ -51,7 +51,7 @@ public KeyMap( )
             Key.S.WithCtrl.ToString( ),
             Key.Y.WithCtrl.ToString( ),
             Key.Z.WithCtrl.ToString( ),
-            Key.Delete.ToString( ),
+            Key.DeleteChar.ToString( ),
             Key.F3.ToString( ),
             Key.F2.ToString( ),
             Key.L.WithCtrl.ToString( ),

diff --git a/tests/KeyMapTests.cs b/tests/KeyMapTests.cs
@@ -21,7 +21,7 @@ internal class KeyMapTests
         Save: Ctrl+S
         Redo: Ctrl+Y
         Undo: Ctrl+Z
-        Delete: Delete
+        Delete: DeleteChar
         ToggleDragging: F3
         AddView: F2
         ToggleShowFocused: Ctrl+L
@@ -119,7 +119,7 @@ public void EmptyConstructor_HasExpectedDefaults( )
             Key.S.WithCtrl.ToString( ),
             Key.Y.WithCtrl.ToString( ),
             Key.Z.WithCtrl.ToString( ),
-            Key.Delete.ToString( ),
+            Key.DeleteChar.ToString( ),
             Key.F3.ToString( ),
             Key.F2.ToString( ),
             Key.L.WithCtrl.ToString( ),

diff --git a/tests/Keys.json b/tests/Keys.json
@@ -1,7 +1,7 @@
 {
   "AddView": "F2",
   "Copy": "Ctrl+C",
-  "Delete": "Delete",
+  "Delete": "DeleteChar",
   "EditProperties": "F4",
   "EditRootProperties": "F5",
   "MoveDown": "Shift+CursorDown",

diff --git a/tests/Keys_Alternate.yaml b/tests/Keys_Alternate.yaml
@@ -8,7 +8,7 @@ Open: Ctrl+O
 Save: Ctrl+S
 Redo: Ctrl+Y
 Undo: Ctrl+Z
-Delete: Delete
+Delete: DeleteChar
 ToggleDragging: F5
 AddView: F6
 ToggleShowFocused: Ctrl+L
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,7 +120,7 @@ public void Run(Options options) @@
                 }
             }
-            Application.KeyUp += (_, k) =>
+            Application.KeyDown += (_, k) =>
             {
                 if (this.editing)
                 {
@@ Expand Down @@