use shift+j/k to scroll main, ctrl+j/k to move commits

jesseduffield · May 25, 2019 · 527c025 · 527c025
1 parent 53cded7
commit 527c025
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 15 deletions.
diff --git a/docs/keybindings/Keybindings_en.md b/docs/keybindings/Keybindings_en.md
@@ -65,8 +65,8 @@
   <kbd>F</kbd>: create fixup commit for this commit
   <kbd>S</kbd>: squash above commits
   <kbd>d</kbd>: delete commit
-  <kbd>J</kbd>: move commit down one
-  <kbd>K</kbd>: move commit up one
+  <kbd>ctrl+j</kbd>: move commit down one
+  <kbd>ctrl+k</kbd>: move commit up one
   <kbd>e</kbd>: edit commit
   <kbd>A</kbd>: amend commit with staged changes
   <kbd>p</kbd>: pick commit (when mid-rebase)

diff --git a/docs/keybindings/Keybindings_nl.md b/docs/keybindings/Keybindings_nl.md
@@ -65,8 +65,8 @@
   <kbd>F</kbd>: creëer fixup commit voor deze commit
   <kbd>S</kbd>: squash bovenstaande commits
   <kbd>d</kbd>: verwijder commit
-  <kbd>J</kbd>: verplaats commit 1 omlaag
-  <kbd>K</kbd>: verplaats commit 1 omhoog
+  <kbd>ctrl+j</kbd>: verplaats commit 1 omlaag
+  <kbd>ctrl+k</kbd>: verplaats commit 1 omhoog
   <kbd>e</kbd>: verander commit
   <kbd>A</kbd>: wijzig commit met staged veranderingen
   <kbd>p</kbd>: pick commit (when mid-rebase)
@@ -95,13 +95,6 @@
   <kbd>o</kbd>: open bestand
 </pre>
 
-## Hoofd (Normaal)
-
-<pre>
-  <kbd>PgDn</kbd>: scroll omlaag (fn+up)
-  <kbd>PgUp</kbd>: scroll omhoog (fn+down)
-</pre>
-
 ## Hoofd (Stage Lines/Hunks)
 
 <pre>
@@ -126,3 +119,10 @@
   <kbd>▼</kbd>: selecteer onderste hunk
   <kbd>z</kbd>: ongedaan maken
 </pre>
+
+## Hoofd (Normaal)
+
+<pre>
+  <kbd>PgDn</kbd>: scroll omlaag (fn+up)
+  <kbd>PgUp</kbd>: scroll omhoog (fn+down)
+</pre>
diff --git a/docs/keybindings/Keybindings_pl.md b/docs/keybindings/Keybindings_pl.md
@@ -65,8 +65,8 @@
   <kbd>F</kbd>: create fixup commit for this commit
   <kbd>S</kbd>: squash above commits
   <kbd>d</kbd>: delete commit
-  <kbd>J</kbd>: move commit down one
-  <kbd>K</kbd>: move commit up one
+  <kbd>ctrl+j</kbd>: move commit down one
+  <kbd>ctrl+k</kbd>: move commit up one
   <kbd>e</kbd>: edit commit
   <kbd>A</kbd>: amend commit with staged changes
   <kbd>p</kbd>: pick commit (when mid-rebase)

diff --git a/pkg/gui/keybindings.go b/pkg/gui/keybindings.go
@@ -29,6 +29,12 @@ func (b *Binding) GetKey() string {
 	case rune:
 		key = int(b.Key.(rune))
 	case gocui.Key:
+		if b.Key.(gocui.Key) == gocui.KeyCtrlJ {
+			return "ctrl+j"
+		}
+		if b.Key.(gocui.Key) == gocui.KeyCtrlK {
+			return "ctrl+k"
+		}
 		key = int(b.Key.(gocui.Key))
 	}
 
@@ -87,6 +93,16 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Modifier:    gocui.ModNone,
 			Handler:     gui.scrollDownMain,
 			Alternative: "fn+down",
+		}, {
+			ViewName: "",
+			Key:      'K',
+			Modifier: gocui.ModNone,
+			Handler:  gui.scrollUpMain,
+		}, {
+			ViewName: "",
+			Key:      'J',
+			Modifier: gocui.ModNone,
+			Handler:  gui.scrollDownMain,
 		}, {
 			ViewName: "",
 			Key:      gocui.KeyCtrlU,
@@ -358,13 +374,13 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
 			Description: gui.Tr.SLocalize("deleteCommit"),
 		}, {
 			ViewName:    "commits",
-			Key:         'J',
+			Key:         gocui.KeyCtrlJ,
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitMoveDown,
 			Description: gui.Tr.SLocalize("moveDownCommit"),
 		}, {
 			ViewName:    "commits",
-			Key:         'K',
+			Key:         gocui.KeyCtrlK,
 			Modifier:    gocui.ModNone,
 			Handler:     gui.handleCommitMoveUp,
 			Description: gui.Tr.SLocalize("moveUpCommit"),