Merge branch 'master' into commit-details-#80

extrawurst · Jun 4, 2020 · 325cda9 · 325cda9
2 parents 64ef1ca + a2e9997
commit 325cda9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - app closes when staging invalid file/path ([#108](https://github.com/extrawurst/gitui/issues/108))
+- `shift+tab` not working on windows [[@MCord](https://github.com/MCord)] ([#111](https://github.com/extrawurst/gitui/issues/111))
 
 ## [0.5.0] - 2020-06-01
 

diff --git a/src/app.rs b/src/app.rs
@@ -129,7 +129,8 @@ impl App {
                     self.toggle_tabs(false)?;
                     NeedsUpdate::COMMANDS
                 }
-                keys::TAB_TOGGLE_REVERSE => {
+                keys::TAB_TOGGLE_REVERSE
+                | keys::TAB_TOGGLE_REVERSE_WINDOWS => {
                     self.toggle_tabs(true)?;
                     NeedsUpdate::COMMANDS
                 }

diff --git a/src/keys.rs b/src/keys.rs
@@ -20,6 +20,9 @@ pub const TAB_3: KeyEvent = no_mod(KeyCode::Char('3'));
 pub const TAB_4: KeyEvent = no_mod(KeyCode::Char('4'));
 pub const TAB_TOGGLE: KeyEvent = no_mod(KeyCode::Tab);
 pub const TAB_TOGGLE_REVERSE: KeyEvent = no_mod(KeyCode::BackTab);
+//TODO: https://github.com/extrawurst/gitui/issues/112
+pub const TAB_TOGGLE_REVERSE_WINDOWS: KeyEvent =
+    with_mod(KeyCode::BackTab, KeyModifiers::SHIFT);
 pub const FOCUS_WORKDIR: KeyEvent = no_mod(KeyCode::Char('w'));
 pub const FOCUS_STAGE: KeyEvent = no_mod(KeyCode::Char('s'));
 pub const FOCUS_RIGHT: KeyEvent = no_mod(KeyCode::Right);