From f92363a0cfcc533cbbdd745fb42b9003a899a0d4 Mon Sep 17 00:00:00 2001 From: Nils Andresen Date: Fri, 13 Nov 2020 14:58:08 +0100 Subject: [PATCH] removed tab_toggle_reverse_windows changed tab_toggle_reverse to include the SHIFT modifier, as crossterm now (i.e. since https://github.com/crossterm-rs/crossterm/pull/490) sends SHIFT modifier for linux, too. --- assets/vim_style_key_config.ron | 3 +-- src/app.rs | 4 +--- src/keys.rs | 4 +--- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/assets/vim_style_key_config.ron b/assets/vim_style_key_config.ron index 6afc7ef269..0a79775745 100644 --- a/assets/vim_style_key_config.ron +++ b/assets/vim_style_key_config.ron @@ -15,8 +15,7 @@ tab_stashes: ( code: Char('4'), modifiers: ( bits: 0,),), tab_toggle: ( code: Tab, modifiers: ( bits: 0,),), - tab_toggle_reverse: ( code: BackTab, modifiers: ( bits: 0,),), - tab_toggle_reverse_windows: ( code: BackTab, modifiers: ( bits: 1,),), + tab_toggle_reverse: ( code: BackTab, modifiers: ( bits: 1,),), focus_workdir: ( code: Char('w'), modifiers: ( bits: 0,),), focus_stage: ( code: Char('s'), modifiers: ( bits: 0,),), diff --git a/src/app.rs b/src/app.rs index 70e803c740..5045cf2f25 100644 --- a/src/app.rs +++ b/src/app.rs @@ -224,9 +224,7 @@ impl App { let new_flags = if k == self.key_config.tab_toggle { self.toggle_tabs(false)?; NeedsUpdate::COMMANDS - } else if k == self.key_config.tab_toggle_reverse - || k == self.key_config.tab_toggle_reverse_windows - { + } else if k == self.key_config.tab_toggle_reverse { self.toggle_tabs(true)?; NeedsUpdate::COMMANDS } else if k == self.key_config.tab_status diff --git a/src/keys.rs b/src/keys.rs index 8c2d640ef8..462d1b0667 100644 --- a/src/keys.rs +++ b/src/keys.rs @@ -23,7 +23,6 @@ pub struct KeyConfig { pub tab_stashes: KeyEvent, pub tab_toggle: KeyEvent, pub tab_toggle_reverse: KeyEvent, - pub tab_toggle_reverse_windows: KeyEvent, pub focus_workdir: KeyEvent, pub focus_stage: KeyEvent, pub focus_right: KeyEvent, @@ -76,8 +75,7 @@ impl Default for KeyConfig { tab_stashing: KeyEvent { code: KeyCode::Char('3'), modifiers: KeyModifiers::empty()}, tab_stashes: KeyEvent { code: KeyCode::Char('4'), modifiers: KeyModifiers::empty()}, tab_toggle: KeyEvent { code: KeyCode::Tab, modifiers: KeyModifiers::empty()}, - tab_toggle_reverse: KeyEvent { code: KeyCode::BackTab, modifiers: KeyModifiers::empty()}, - tab_toggle_reverse_windows: KeyEvent { code: KeyCode::BackTab, modifiers: KeyModifiers::SHIFT}, + tab_toggle_reverse: KeyEvent { code: KeyCode::BackTab, modifiers: KeyModifiers::SHIFT}, focus_workdir: KeyEvent { code: KeyCode::Char('w'), modifiers: KeyModifiers::empty()}, focus_stage: KeyEvent { code: KeyCode::Char('s'), modifiers: KeyModifiers::empty()}, focus_right: KeyEvent { code: KeyCode::Right, modifiers: KeyModifiers::empty()},