diff options
| author | a-kenji <aks.kenji@protonmail.com> | 2021-06-14 22:05:25 +0200 |
|---|---|---|
| committer | a-kenji <aks.kenji@protonmail.com> | 2021-06-14 22:05:25 +0200 |
| commit | 4743b7e7ab803b16cc703d2238068647857295c5 (patch) | |
| tree | 297041fe76ca6fdeff65f4812f81e562e2cc2a96 /default-plugins | |
| parent | Move `layout.rs` from `server` to `utils` (diff) | |
| parent | docs(contributing): add the invite link to the discord server (#570) (diff) | |
| download | sl0ppij-4743b7e7ab803b16cc703d2238068647857295c5.tar.gz sl0ppij-4743b7e7ab803b16cc703d2238068647857295c5.tar.xz sl0ppij-4743b7e7ab803b16cc703d2238068647857295c5.zip | |
Merge branch 'main' of https://github.com/zellij-org/zellij into layout-error
Diffstat (limited to 'default-plugins')
| -rw-r--r-- | default-plugins/status-bar/src/main.rs | 2 | ||||
| -rw-r--r-- | default-plugins/tab-bar/src/main.rs | 3 | ||||
| -rw-r--r-- | default-plugins/tab-bar/src/tab.rs | 7 |
3 files changed, 3 insertions, 9 deletions
diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs index cf9445d6..83eb50c9 100644 --- a/default-plugins/status-bar/src/main.rs +++ b/default-plugins/status-bar/src/main.rs @@ -135,7 +135,7 @@ impl ZellijPlugin for State { fn load(&mut self) { set_selectable(false); set_invisible_borders(true); - set_max_height(2); + set_fixed_height(2); subscribe(&[EventType::ModeUpdate]); } diff --git a/default-plugins/tab-bar/src/main.rs b/default-plugins/tab-bar/src/main.rs index 46336be3..1f83dcde 100644 --- a/default-plugins/tab-bar/src/main.rs +++ b/default-plugins/tab-bar/src/main.rs @@ -26,7 +26,7 @@ impl ZellijPlugin for State { fn load(&mut self) { set_selectable(false); set_invisible_borders(true); - set_max_height(1); + set_fixed_height(1); subscribe(&[EventType::TabUpdate, EventType::ModeUpdate]); } @@ -57,7 +57,6 @@ impl ZellijPlugin for State { let tab = tab_style( tabname, t.active, - t.position, t.is_sync_panes_active, self.mode_info.palette, self.mode_info.capabilities, diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs index fb8e377d..9edfba13 100644 --- a/default-plugins/tab-bar/src/tab.rs +++ b/default-plugins/tab-bar/src/tab.rs @@ -40,17 +40,12 @@ pub fn non_active_tab(text: String, palette: Palette, separator: &str) -> LinePa pub fn tab_style( text: String, is_active_tab: bool, - position: usize, is_sync_panes_active: bool, palette: Palette, capabilities: PluginCapabilities, ) -> LinePart { let separator = tab_separator(capabilities); - let mut tab_text = if text.is_empty() { - format!("Tab #{}", position + 1) - } else { - text - }; + let mut tab_text = text; if is_sync_panes_active { tab_text.push_str(" (Sync)"); } |
