diff options
| author | dantepippi <6619666+dantepippi@users.noreply.github.com> | 2021-05-07 11:07:23 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-07 16:07:23 +0200 |
| commit | 543b70a2bdd343ee274f9dca65020bd6915c8b27 (patch) | |
| tree | 3751d0e039ddeec75cf93855c6070ab090ca2033 /src/common | |
| parent | docs(changelog): terminal aifx (diff) | |
| download | sl0ppij-543b70a2bdd343ee274f9dca65020bd6915c8b27.tar.gz sl0ppij-543b70a2bdd343ee274f9dca65020bd6915c8b27.tar.xz sl0ppij-543b70a2bdd343ee274f9dca65020bd6915c8b27.zip | |
Moving the sync command to the Tab mode (#412)
* Moving the sync command to the Tab mode
* Fixing bug related to plugin panes and sync mode
When sync mode was enabled the input from a plugin pane was being
incorrectly ignored.
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/errors.rs | 4 | ||||
| -rw-r--r-- | src/common/input/actions.rs | 4 | ||||
| -rw-r--r-- | src/common/input/handler.rs | 2 | ||||
| -rw-r--r-- | src/common/screen.rs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/common/errors.rs b/src/common/errors.rs index 411e0225..d8327462 100644 --- a/src/common/errors.rs +++ b/src/common/errors.rs @@ -200,7 +200,7 @@ pub enum ScreenContext { PageScrollDown, ClearScroll, CloseFocusedPane, - ToggleActiveSyncPanes, + ToggleActiveSyncTab, ToggleActiveTerminalFullscreen, SetSelectable, SetInvisibleBorders, @@ -261,7 +261,7 @@ impl From<&ScreenInstruction> for ScreenContext { ScreenInstruction::UpdateTabName(_) => ScreenContext::UpdateTabName, ScreenInstruction::TerminalResize(_) => ScreenContext::TerminalResize, ScreenInstruction::ChangeMode(_) => ScreenContext::ChangeMode, - ScreenInstruction::ToggleActiveSyncPanes => ScreenContext::ToggleActiveSyncPanes, + ScreenInstruction::ToggleActiveSyncTab => ScreenContext::ToggleActiveSyncTab, } } } diff --git a/src/common/input/actions.rs b/src/common/input/actions.rs index 46a8e1d6..54cbbcdc 100644 --- a/src/common/input/actions.rs +++ b/src/common/input/actions.rs @@ -39,8 +39,8 @@ pub enum Action { PageScrollDown, /// Toggle between fullscreen focus pane and normal layout. ToggleFocusFullscreen, - /// Toggle between sending text commands to all panes and normal mode. - ToggleActiveSyncPanes, + /// Toggle between sending text commands to all panes on the current tab and normal mode. + ToggleActiveSyncTab, /// Open a new pane in the specified direction (relative to focus). /// If no direction is specified, will try to use the biggest available space. NewPane(Option<Direction>), diff --git a/src/common/input/handler.rs b/src/common/input/handler.rs index 75f9f8b1..a4293220 100644 --- a/src/common/input/handler.rs +++ b/src/common/input/handler.rs @@ -160,7 +160,6 @@ pub fn get_mode_info(mode: InputMode, palette: Palette) -> ModeInfo { keybinds.push(("d".to_string(), "Down split".to_string())); keybinds.push(("r".to_string(), "Right split".to_string())); keybinds.push(("x".to_string(), "Close".to_string())); - keybinds.push(("s".to_string(), "Sync".to_string())); keybinds.push(("f".to_string(), "Fullscreen".to_string())); } InputMode::Tab => { @@ -168,6 +167,7 @@ pub fn get_mode_info(mode: InputMode, palette: Palette) -> ModeInfo { keybinds.push(("n".to_string(), "New".to_string())); keybinds.push(("x".to_string(), "Close".to_string())); keybinds.push(("r".to_string(), "Rename".to_string())); + keybinds.push(("s".to_string(), "Sync".to_string())); } InputMode::Scroll => { keybinds.push(("↓↑".to_string(), "Scroll".to_string())); diff --git a/src/common/screen.rs b/src/common/screen.rs index 562b0ffe..62d87b51 100644 --- a/src/common/screen.rs +++ b/src/common/screen.rs @@ -52,7 +52,7 @@ pub enum ScreenInstruction { NewTab(RawFd), SwitchTabNext, SwitchTabPrev, - ToggleActiveSyncPanes, + ToggleActiveSyncTab, CloseTab, GoToTab(u32), UpdateTabName(Vec<u8>), |
