From b3e9dda726212da662587bb320e5758f07341dc3 Mon Sep 17 00:00:00 2001
From: AdaShoelace <adashoelace@gmail.com>
Date: Mon, 31 May 2021 17:00:14 +0200
Subject: Set tab name on creation instead of on render

---
 default-plugins/tab-bar/src/tab.rs | 6 +-----
 zellij-server/src/tab.rs           | 6 +++++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/default-plugins/tab-bar/src/tab.rs b/default-plugins/tab-bar/src/tab.rs
index fb8e377d1..7e83e85bb 100644
--- a/default-plugins/tab-bar/src/tab.rs
+++ b/default-plugins/tab-bar/src/tab.rs
@@ -46,11 +46,7 @@ pub fn tab_style(
     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)");
     }
diff --git a/zellij-server/src/tab.rs b/zellij-server/src/tab.rs
index 7daf20925..58efd2927 100644
--- a/zellij-server/src/tab.rs
+++ b/zellij-server/src/tab.rs
@@ -259,7 +259,11 @@ impl Tab {
             index,
             position,
             panes,
-            name,
+            name: if name.is_empty() {
+                format!("Tab #{} (unnamed)", position + 1)
+            } else {
+                name
+            },
             max_panes,
             panes_to_hide: HashSet::new(),
             active_terminal: pane_id,
-- 
cgit v1.2.3


From 16a47cdd069378852af2be5e49d2873c7813c236 Mon Sep 17 00:00:00 2001
From: AdaShoelace <adashoelace@gmail.com>
Date: Mon, 31 May 2021 22:06:08 +0200
Subject: Initial names outside return struct

---
 zellij-server/src/tab.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/zellij-server/src/tab.rs b/zellij-server/src/tab.rs
index 58efd2927..b74dcad20 100644
--- a/zellij-server/src/tab.rs
+++ b/zellij-server/src/tab.rs
@@ -255,15 +255,18 @@ impl Tab {
         } else {
             BTreeMap::new()
         };
+
+        let name = if name.is_empty() {
+            format!("Tab #{} (unnamed)", position + 1)
+        } else {
+            name
+        };
+
         Tab {
             index,
             position,
             panes,
-            name: if name.is_empty() {
-                format!("Tab #{} (unnamed)", position + 1)
-            } else {
-                name
-            },
+            name,
             max_panes,
             panes_to_hide: HashSet::new(),
             active_terminal: pane_id,
-- 
cgit v1.2.3


From b9677589a0ade53c421f0910f0a29c212a0e97ff Mon Sep 17 00:00:00 2001
From: AdaShoelace <adashoelace@gmail.com>
Date: Tue, 1 Jun 2021 09:41:16 +0200
Subject: Omit '(unnamed)' from tab name

---
 zellij-server/src/tab.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zellij-server/src/tab.rs b/zellij-server/src/tab.rs
index b74dcad20..e1bbf2e54 100644
--- a/zellij-server/src/tab.rs
+++ b/zellij-server/src/tab.rs
@@ -257,7 +257,7 @@ impl Tab {
         };
 
         let name = if name.is_empty() {
-            format!("Tab #{} (unnamed)", position + 1)
+            format!("Tab #{}", position + 1)
         } else {
             name
         };
-- 
cgit v1.2.3