From c958fc67eb75bcc4a6d38df52b78a34e7381d38a Mon Sep 17 00:00:00 2001 From: Dante Pippi <6619666+dantepippi@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:53:13 -0300 Subject: [PATCH 1/2] Fix Tab (Sync) suffix --- default-plugins/tab-bar/src/tab.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs index 0bc143b7..398ce3f9 100644 --- a/default-plugins/tab-bar/src/tab.rs +++ b/default-plugins/tab-bar/src/tab.rs @@ -47,14 +47,15 @@ pub fn tab_style( is_sync_panes_active: bool, ) -> LinePart { let sync_text = match is_sync_panes_active { - true => " (Sync)".to_string(), - false => "".to_string(), + true => " (Sync)", + false => "", }; - let tab_text = if text.is_empty() { - format!("Tab #{}{}", position + 1, sync_text) + let mut tab_text = if text.is_empty() { + format!("Tab #{}", position + 1) } else { text }; + tab_text.push_str(sync_text); if is_active_tab { active_tab(tab_text) } else { From 2a3debc1c7bd23e42827ff0bfb1ac8ca40d0d5c8 Mon Sep 17 00:00:00 2001 From: Dante Pippi <6619666+dantepippi@users.noreply.github.com> Date: Thu, 29 Apr 2021 11:11:55 -0300 Subject: [PATCH 2/2] Style fix --- default-plugins/tab-bar/src/tab.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs index 398ce3f9..6c52e629 100644 --- a/default-plugins/tab-bar/src/tab.rs +++ b/default-plugins/tab-bar/src/tab.rs @@ -46,16 +46,14 @@ pub fn tab_style( position: usize, is_sync_panes_active: bool, ) -> LinePart { - let sync_text = match is_sync_panes_active { - true => " (Sync)", - false => "", - }; let mut tab_text = if text.is_empty() { format!("Tab #{}", position + 1) } else { text }; - tab_text.push_str(sync_text); + if is_sync_panes_active { + tab_text.push_str(" (Sync)"); + } if is_active_tab { active_tab(tab_text) } else {