From 7b67a08dd6cc9a62806275c6c4cb0d7a06e11788 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Wed, 5 Feb 2025 23:56:20 +0800
Subject: [PATCH 01/44] Rudimentary tab renaming. Does not persist on page name
 change or restart

---
 src/browser/base/content/zen-assets.inc.xhtml |  1 +
 .../base/content/zen-assets.jar.inc.mn        |  1 +
 .../base/zen-components/ZenTabManager.mjs     | 84 +++++++++++++++++++
 3 files changed, 86 insertions(+)
 create mode 100644 src/browser/base/zen-components/ZenTabManager.mjs

diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index eefa0a5dd..4ec7bf8f0 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -33,6 +33,7 @@
 <script src="chrome://browser/content/ZenUIManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenSidebarManager.mjs"/>
 <script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
+<script src="chrome://browser/content/zen-components/ZenTabManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" />
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index 69b4c1c56..72cb72b1f 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -15,6 +15,7 @@
         content/browser/zen-components/ZenKeyboardShortcuts.mjs (zen-components/ZenKeyboardShortcuts.mjs)
         content/browser/zen-components/ZenThemesImporter.mjs    (zen-components/ZenThemesImporter.mjs)
         content/browser/zen-components/ZenTabUnloader.mjs       (zen-components/ZenTabUnloader.mjs)
+        content/browser/zen-components/ZenTabManager.mjs        (zen-components/ZenTabManager.mjs)
         content/browser/zen-components/ZenPinnedTabsStorage.mjs (zen-components/ZenPinnedTabsStorage.mjs)
         content/browser/zen-components/ZenPinnedTabManager.mjs  (zen-components/ZenPinnedTabManager.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs       (zen-components/ZenCommonUtils.mjs)
diff --git a/src/browser/base/zen-components/ZenTabManager.mjs b/src/browser/base/zen-components/ZenTabManager.mjs
new file mode 100644
index 000000000..0a381b6f2
--- /dev/null
+++ b/src/browser/base/zen-components/ZenTabManager.mjs
@@ -0,0 +1,84 @@
+class ZenBrowserTabManager extends ZenDOMOperatedFeature {
+  _tabEdited = null;
+  init() {
+    this._insertItemsIntoTabContextMenu();
+
+  }
+
+  _insertItemsIntoTabContextMenu() {
+    const element = window.MozXULElement.parseXULToFragment(`
+      <menuitem id="context_zen-rename-tab"
+                data-l10n-id="tab-context-zen-rename-tab"
+                oncommand="gZenBrowserTabManager.contextRenameTab();" />
+    `);
+    document.getElementById('context_duplicateTabs').after(element);
+    console.log("akjsdhfjkb")
+  }
+
+  contextRenameTab(event) {
+    this.contextRenameTabStart(event);
+  }
+
+  contextRenameTabKeydown(event) {
+    if (event.key === 'Enter') {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      let input = this._tabEdited.querySelector('#tab-label-input');
+      let newName = input.value;
+      this._tabEdited.setAttribute('label', newName);
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    } else if (event.key === "Escape") {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    }
+  }
+  contextRenameTabStart(event) {
+    const label = TabContextMenu.contextTab.querySelector(".tab-label-container")
+    label.style.display = 'none';
+    label.className += ' tab-label-container-editing';
+
+    const container = window.MozXULElement.parseXULToFragment(`
+      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
+    `);
+    label.after(container);
+    const containerHtml = TabContextMenu.contextTab.querySelector('.tab-editor-container');
+    const input = document.createElement('input');
+    input.id = 'tab-label-input';
+    input.value = TabContextMenu.contextTab.label;
+    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
+    input.style["white-space"] = "nowrap";
+    input.style["overflow-x"] = "scroll";
+    input.style["margin"] = "0";
+
+    containerHtml.appendChild(input);
+    input.focus();
+    input.select()
+    this._tabEdited = TabContextMenu.contextTab;
+
+    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
+
+  }
+
+  contextRenameTabHalt(event) {
+    if (event.target.closest('#tab-label-input')) {
+      return;
+    }
+    this._tabEdited.querySelector('.tab-editor-container').remove();
+    const label = this._tabEdited.querySelector(".tab-label-container-editing");
+    label.style.display = '';
+    label.className = label.className.replace(' tab-label-container-editing', '');
+
+    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+  }
+
+}
+
+window.gZenBrowserTabManager = new ZenBrowserTabManager();

From 5620e8d1ac49c55f31a2802f2db2efab970ebbc8 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 08:09:08 +0800
Subject: [PATCH 02/44] Moved rename to gZenVerticalTabsManager, changed to
 double click on pinned tabs

---
 src/browser/base/content/ZenUIManager.mjs     | 86 +++++++++++++++++++
 src/browser/base/content/zen-assets.inc.xhtml |  1 -
 .../base/content/zen-assets.jar.inc.mn        |  1 -
 .../base/zen-components/ZenTabManager.mjs     | 84 ------------------
 4 files changed, 86 insertions(+), 86 deletions(-)
 delete mode 100644 src/browser/base/zen-components/ZenTabManager.mjs

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index c33aa0071..e551deefc 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -182,6 +182,7 @@ var gZenUIManager = {
 };
 
 var gZenVerticalTabsManager = {
+  _tabEdited: null,
   init() {
     this._multiWindowFeature = new ZenMultiWindowFeature();
     this._initWaitPromise();
@@ -226,6 +227,8 @@ var gZenVerticalTabsManager = {
     if (tabs) {
       tabs.addEventListener('mouseup', this.openNewTabOnTabsMiddleClick.bind(this));
     }
+
+    this._insertDoubleClickListenerPinnedTabs();
   },
 
   openNewTabOnTabsMiddleClick(event) {
@@ -593,4 +596,87 @@ var gZenVerticalTabsManager = {
     }
     target.appendChild(child);
   },
+
+
+  //_insertItemsIntoTabContextMenu() {
+  //  const element = window.MozXULElement.parseXULToFragment(`
+  //    <menuitem id="context_zen-rename-tab"
+  //              data-l10n-id="tab-context-zen-rename-tab"
+  //              oncommand="gZenVerticalTabsManager.contextRenameTab();" />
+  //  `);
+  //  document.getElementById('context_duplicateTabs').after(element);
+  //},
+
+  _insertDoubleClickListenerPinnedTabs() {
+    const tabs = gBrowser.tabs;
+    for (const tab of tabs) {
+      if (tab.pinned) {
+        tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
+      }
+    }
+  },
+
+  contextRenameTabKeydown(event) {
+    if (event.key === 'Enter') {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      let input = this._tabEdited.querySelector('#tab-label-input');
+      let newName = input.value;
+      this._tabEdited.setAttribute('label', newName);
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    } else if (event.key === "Escape") {
+      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      this._tabEdited.querySelector('.tab-editor-container').remove();
+
+      label.style.display = '';
+      label.className = label.className.replace(' tab-label-container-editing', '');
+      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      this._tabEdited = null;
+    }
+  },
+  contextRenameTabStart(event) {
+    if (event.target.closest('.tab-label-container-editing')) {
+      return;
+    }
+    this._tabEdited = event.target.closest('.tabbrowser-tab');
+    console.log(this._tabEdited)
+    const label = this._tabEdited.querySelector(".tab-label-container")
+    label.style.display = 'none';
+    label.className += ' tab-label-container-editing';
+
+    const container = window.MozXULElement.parseXULToFragment(`
+      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
+    `);
+    label.after(container);
+    const containerHtml = this._tabEdited.querySelector('.tab-editor-container');
+    const input = document.createElement('input');
+    input.id = 'tab-label-input';
+    input.value = this._tabEdited.label;
+    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
+    input.style["white-space"] = "nowrap";
+    input.style["overflow-x"] = "scroll";
+    input.style["margin"] = "0";
+
+    containerHtml.appendChild(input);
+    input.focus();
+    input.select()
+
+    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
+
+  },
+
+  contextRenameTabHalt(event) {
+    if (event.target.closest('#tab-label-input')) {
+      return;
+    }
+    this._tabEdited.querySelector('.tab-editor-container').remove();
+    const label = this._tabEdited.querySelector(".tab-label-container-editing");
+    label.style.display = '';
+    label.className = label.className.replace(' tab-label-container-editing', '');
+
+    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+  },
 };
diff --git a/src/browser/base/content/zen-assets.inc.xhtml b/src/browser/base/content/zen-assets.inc.xhtml
index 4ec7bf8f0..eefa0a5dd 100644
--- a/src/browser/base/content/zen-assets.inc.xhtml
+++ b/src/browser/base/content/zen-assets.inc.xhtml
@@ -33,7 +33,6 @@
 <script src="chrome://browser/content/ZenUIManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenSidebarManager.mjs"/>
 <script src="chrome://browser/content/zen-components/ZenTabUnloader.mjs" />
-<script src="chrome://browser/content/zen-components/ZenTabManager.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabsStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenWorkspacesStorage.mjs" />
 <script src="chrome://browser/content/zen-components/ZenPinnedTabManager.mjs" />
diff --git a/src/browser/base/content/zen-assets.jar.inc.mn b/src/browser/base/content/zen-assets.jar.inc.mn
index 93a415813..563908e14 100644
--- a/src/browser/base/content/zen-assets.jar.inc.mn
+++ b/src/browser/base/content/zen-assets.jar.inc.mn
@@ -16,7 +16,6 @@
         content/browser/zen-components/ZenKeyboardShortcuts.mjs (zen-components/ZenKeyboardShortcuts.mjs)
         content/browser/zen-components/ZenThemesImporter.mjs    (zen-components/ZenThemesImporter.mjs)
         content/browser/zen-components/ZenTabUnloader.mjs       (zen-components/ZenTabUnloader.mjs)
-        content/browser/zen-components/ZenTabManager.mjs        (zen-components/ZenTabManager.mjs)
         content/browser/zen-components/ZenPinnedTabsStorage.mjs (zen-components/ZenPinnedTabsStorage.mjs)
         content/browser/zen-components/ZenPinnedTabManager.mjs  (zen-components/ZenPinnedTabManager.mjs)
         content/browser/zen-components/ZenCommonUtils.mjs       (zen-components/ZenCommonUtils.mjs)
diff --git a/src/browser/base/zen-components/ZenTabManager.mjs b/src/browser/base/zen-components/ZenTabManager.mjs
deleted file mode 100644
index 0a381b6f2..000000000
--- a/src/browser/base/zen-components/ZenTabManager.mjs
+++ /dev/null
@@ -1,84 +0,0 @@
-class ZenBrowserTabManager extends ZenDOMOperatedFeature {
-  _tabEdited = null;
-  init() {
-    this._insertItemsIntoTabContextMenu();
-
-  }
-
-  _insertItemsIntoTabContextMenu() {
-    const element = window.MozXULElement.parseXULToFragment(`
-      <menuitem id="context_zen-rename-tab"
-                data-l10n-id="tab-context-zen-rename-tab"
-                oncommand="gZenBrowserTabManager.contextRenameTab();" />
-    `);
-    document.getElementById('context_duplicateTabs').after(element);
-    console.log("akjsdhfjkb")
-  }
-
-  contextRenameTab(event) {
-    this.contextRenameTabStart(event);
-  }
-
-  contextRenameTabKeydown(event) {
-    if (event.key === 'Enter') {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
-      let input = this._tabEdited.querySelector('#tab-label-input');
-      let newName = input.value;
-      this._tabEdited.setAttribute('label', newName);
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
-      this._tabEdited = null;
-    } else if (event.key === "Escape") {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
-      this._tabEdited = null;
-    }
-  }
-  contextRenameTabStart(event) {
-    const label = TabContextMenu.contextTab.querySelector(".tab-label-container")
-    label.style.display = 'none';
-    label.className += ' tab-label-container-editing';
-
-    const container = window.MozXULElement.parseXULToFragment(`
-      <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
-    `);
-    label.after(container);
-    const containerHtml = TabContextMenu.contextTab.querySelector('.tab-editor-container');
-    const input = document.createElement('input');
-    input.id = 'tab-label-input';
-    input.value = TabContextMenu.contextTab.label;
-    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
-    input.style["white-space"] = "nowrap";
-    input.style["overflow-x"] = "scroll";
-    input.style["margin"] = "0";
-
-    containerHtml.appendChild(input);
-    input.focus();
-    input.select()
-    this._tabEdited = TabContextMenu.contextTab;
-
-    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
-
-  }
-
-  contextRenameTabHalt(event) {
-    if (event.target.closest('#tab-label-input')) {
-      return;
-    }
-    this._tabEdited.querySelector('.tab-editor-container').remove();
-    const label = this._tabEdited.querySelector(".tab-label-container-editing");
-    label.style.display = '';
-    label.className = label.className.replace(' tab-label-container-editing', '');
-
-    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
-  }
-
-}
-
-window.gZenBrowserTabManager = new ZenBrowserTabManager();

From 48a5891c912bd1e23ce9cf5c97ba286b046fe572 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 08:13:20 +0800
Subject: [PATCH 03/44] Fixed code formatting for linter

---
 src/browser/base/content/ZenUIManager.mjs | 32 ++++++++---------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index e551deefc..7b150122a 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -597,16 +597,6 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-
-  //_insertItemsIntoTabContextMenu() {
-  //  const element = window.MozXULElement.parseXULToFragment(`
-  //    <menuitem id="context_zen-rename-tab"
-  //              data-l10n-id="tab-context-zen-rename-tab"
-  //              oncommand="gZenVerticalTabsManager.contextRenameTab();" />
-  //  `);
-  //  document.getElementById('context_duplicateTabs').after(element);
-  //},
-
   _insertDoubleClickListenerPinnedTabs() {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
@@ -618,7 +608,7 @@ var gZenVerticalTabsManager = {
 
   contextRenameTabKeydown(event) {
     if (event.key === 'Enter') {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+      let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');
       let newName = input.value;
       this._tabEdited.setAttribute('label', newName);
@@ -627,8 +617,8 @@ var gZenVerticalTabsManager = {
       label.className = label.className.replace(' tab-label-container-editing', '');
       document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
       this._tabEdited = null;
-    } else if (event.key === "Escape") {
-      let label = this._tabEdited.querySelector(".tab-label-container-editing");
+    } else if (event.key === 'Escape') {
+      let label = this._tabEdited.querySelector('.tab-label-container-editing');
       this._tabEdited.querySelector('.tab-editor-container').remove();
 
       label.style.display = '';
@@ -637,13 +627,14 @@ var gZenVerticalTabsManager = {
       this._tabEdited = null;
     }
   },
+
   contextRenameTabStart(event) {
     if (event.target.closest('.tab-label-container-editing')) {
       return;
     }
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    console.log(this._tabEdited)
-    const label = this._tabEdited.querySelector(".tab-label-container")
+    console.log(this._tabEdited);
+    const label = this._tabEdited.querySelector('.tab-label-container');
     label.style.display = 'none';
     label.className += ' tab-label-container-editing';
 
@@ -656,16 +647,15 @@ var gZenVerticalTabsManager = {
     input.id = 'tab-label-input';
     input.value = this._tabEdited.label;
     input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
-    input.style["white-space"] = "nowrap";
-    input.style["overflow-x"] = "scroll";
-    input.style["margin"] = "0";
+    input.style['white-space'] = 'nowrap';
+    input.style['overflow-x'] = 'scroll';
+    input.style['margin'] = '0';
 
     containerHtml.appendChild(input);
     input.focus();
-    input.select()
+    input.select();
 
     document.addEventListener('click', this.contextRenameTabHalt.bind(this));
-
   },
 
   contextRenameTabHalt(event) {
@@ -673,7 +663,7 @@ var gZenVerticalTabsManager = {
       return;
     }
     this._tabEdited.querySelector('.tab-editor-container').remove();
-    const label = this._tabEdited.querySelector(".tab-label-container-editing");
+    const label = this._tabEdited.querySelector('.tab-label-container-editing');
     label.style.display = '';
     label.className = label.className.replace(' tab-label-container-editing', '');
 

From 02342e2806416b63d5696d5686ee3fabfbe5a974 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 08:42:53 +0800
Subject: [PATCH 04/44] Fixed bug where new pinned tabs can't be renamed

---
 src/browser/base/content/ZenUIManager.mjs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 7b150122a..4eafe5974 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -600,9 +600,7 @@ var gZenVerticalTabsManager = {
   _insertDoubleClickListenerPinnedTabs() {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
-      if (tab.pinned) {
-        tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
-      }
+      tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
     }
   },
 
@@ -629,11 +627,12 @@ var gZenVerticalTabsManager = {
   },
 
   contextRenameTabStart(event) {
-    if (event.target.closest('.tab-label-container-editing')) {
+    if (this._tabEdited) return;
+    this._tabEdited = event.target.closest('.tabbrowser-tab');
+    if (!this._tabEdited.pinned) {
+      this._tabEdited = null;
       return;
     }
-    this._tabEdited = event.target.closest('.tabbrowser-tab');
-    console.log(this._tabEdited);
     const label = this._tabEdited.querySelector('.tab-label-container');
     label.style.display = 'none';
     label.className += ' tab-label-container-editing';
@@ -662,11 +661,15 @@ var gZenVerticalTabsManager = {
     if (event.target.closest('#tab-label-input')) {
       return;
     }
+    if (!this._tabEdited) {
+      return;
+    }
     this._tabEdited.querySelector('.tab-editor-container').remove();
     const label = this._tabEdited.querySelector('.tab-label-container-editing');
     label.style.display = '';
     label.className = label.className.replace(' tab-label-container-editing', '');
 
     document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+    this._tabEdited = null;
   },
 };

From 19b7eacfc4a189d7022983e9edfee41fc80a6240 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 6 Feb 2025 21:40:04 +0800
Subject: [PATCH 05/44] Added persisting in tab label renaming, added tab label
 resetting

---
 src/browser/base/content/ZenUIManager.mjs | 34 +++++++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 4eafe5974..fd0905c81 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -601,6 +601,23 @@ var gZenVerticalTabsManager = {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
       tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
+      tab.renamedName = null;
+      tab.originalName = null;
+
+      // Persist tab label and store changes for resetting
+      let observer = new MutationObserver((mutations) => {
+        if (!tab.renamedName) {
+          return;
+        }
+        mutations.forEach((mutation) => {
+          if (tab.label !== tab.renamedName) {
+            tab.originalName = tab.label;
+            tab.label = tab.renamedName;
+          }
+        });
+      });
+      // Run on all changes of label
+      observer.observe(tab, { attributes: true, attributeFilter: ['label'] });
     }
   },
 
@@ -608,12 +625,24 @@ var gZenVerticalTabsManager = {
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');
-      let newName = input.value;
-      this._tabEdited.setAttribute('label', newName);
+      let newName = input.value.trim();
+
+      // Check if name is blank, reset if so
+      if (newName) {
+        this._tabEdited.originalName = this._tabEdited.label;
+        this._tabEdited.label = newName;
+        this._tabEdited.renamedName = newName;
+      } else {
+        this._tabEdited.label = this._tabEdited.originalName;
+        this._tabEdited.originalName = null;
+        this._tabEdited.renamedName = null;
+      }
+
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.style.display = '';
       label.className = label.className.replace(' tab-label-container-editing', '');
       document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
@@ -658,6 +687,7 @@ var gZenVerticalTabsManager = {
   },
 
   contextRenameTabHalt(event) {
+    // Ignore click event if it's clicking the input
     if (event.target.closest('#tab-label-input')) {
       return;
     }

From 8f1b7723c8d72f3abc65d9eb355ede74e596585e Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Fri, 7 Feb 2025 11:56:44 +0800
Subject: [PATCH 06/44] Added zen-has-static-label to session store,
 temporarily removed label persist functionality, rewrote tab reset to use DOM

---
 src/browser/base/content/ZenUIManager.mjs     | 47 +++++++------------
 .../sessionstore/TabState-sys-mjs.patch       |  5 +-
 .../tabbrowser/content/tabbrowser-js.patch    | 42 ++++++++++-------
 3 files changed, 43 insertions(+), 51 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index fd0905c81..81071b38e 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -600,28 +600,11 @@ var gZenVerticalTabsManager = {
   _insertDoubleClickListenerPinnedTabs() {
     const tabs = gBrowser.tabs;
     for (const tab of tabs) {
-      tab.addEventListener('dblclick', this.contextRenameTabStart.bind(this));
-      tab.renamedName = null;
-      tab.originalName = null;
-
-      // Persist tab label and store changes for resetting
-      let observer = new MutationObserver((mutations) => {
-        if (!tab.renamedName) {
-          return;
-        }
-        mutations.forEach((mutation) => {
-          if (tab.label !== tab.renamedName) {
-            tab.originalName = tab.label;
-            tab.label = tab.renamedName;
-          }
-        });
-      });
-      // Run on all changes of label
-      observer.observe(tab, { attributes: true, attributeFilter: ['label'] });
+      tab.addEventListener('dblclick', this.renameTabStart.bind(this));
     }
   },
 
-  contextRenameTabKeydown(event) {
+  renameTabKeydown(event) {
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       let input = this._tabEdited.querySelector('#tab-label-input');
@@ -629,19 +612,21 @@ var gZenVerticalTabsManager = {
 
       // Check if name is blank, reset if so
       if (newName) {
-        this._tabEdited.originalName = this._tabEdited.label;
         this._tabEdited.label = newName;
-        this._tabEdited.renamedName = newName;
+        this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
-        this._tabEdited.label = this._tabEdited.originalName;
-        this._tabEdited.originalName = null;
-        this._tabEdited.renamedName = null;
+        // If the page is loaded, get the title of the page. Otherwise, keep name as is
+        this._tabEdited.label = gBrowser.getBrowserForTab(this._tabEdited).contentTitle || this._tabEdited.label;
+        // If the page had a title, reset the zen-has-static-label attribute
+        if (gBrowser.getBrowserForTab(this._tabEdited).contentTitle) {
+          this._tabEdited.removeAttribute('zen-has-static-label');
+        }
       }
 
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.style.display = '';
       label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      document.removeEventListener('click', this.renameTabHalt.bind(this));
 
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
@@ -650,12 +635,12 @@ var gZenVerticalTabsManager = {
 
       label.style.display = '';
       label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+      document.removeEventListener('click', this.renameTabHalt.bind(this));
       this._tabEdited = null;
     }
   },
 
-  contextRenameTabStart(event) {
+  renameTabStart(event) {
     if (this._tabEdited) return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
     if (!this._tabEdited.pinned) {
@@ -674,7 +659,7 @@ var gZenVerticalTabsManager = {
     const input = document.createElement('input');
     input.id = 'tab-label-input';
     input.value = this._tabEdited.label;
-    input.addEventListener('keydown', this.contextRenameTabKeydown.bind(this));
+    input.addEventListener('keydown', this.renameTabKeydown.bind(this));
     input.style['white-space'] = 'nowrap';
     input.style['overflow-x'] = 'scroll';
     input.style['margin'] = '0';
@@ -683,10 +668,10 @@ var gZenVerticalTabsManager = {
     input.focus();
     input.select();
 
-    document.addEventListener('click', this.contextRenameTabHalt.bind(this));
+    document.addEventListener('click', this.renameTabHalt.bind(this));
   },
 
-  contextRenameTabHalt(event) {
+  renameTabHalt(event) {
     // Ignore click event if it's clicking the input
     if (event.target.closest('#tab-label-input')) {
       return;
@@ -699,7 +684,7 @@ var gZenVerticalTabsManager = {
     label.style.display = '';
     label.className = label.className.replace(' tab-label-container-editing', '');
 
-    document.removeEventListener('click', this.contextRenameTabHalt.bind(this));
+    document.removeEventListener('click', this.renameTabHalt.bind(this));
     this._tabEdited = null;
   },
 };
diff --git a/src/browser/components/sessionstore/TabState-sys-mjs.patch b/src/browser/components/sessionstore/TabState-sys-mjs.patch
index a38f9b7c4..26972ac49 100644
--- a/src/browser/components/sessionstore/TabState-sys-mjs.patch
+++ b/src/browser/components/sessionstore/TabState-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sessionstore/TabState.sys.mjs b/browser/components/sessionstore/TabState.sys.mjs
-index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..83bf443ca158c07e05075777da02b7f228d83dff 100644
+index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..dc0fdf17952df397a684f8a1da2f71739d007350 100644
 --- a/browser/components/sessionstore/TabState.sys.mjs
 +++ b/browser/components/sessionstore/TabState.sys.mjs
-@@ -84,6 +84,13 @@ class _TabState {
+@@ -84,6 +84,14 @@ class _TabState {
        tabData.groupId = tab.group.id;
      }
  
@@ -12,6 +12,7 @@ index 8f7ed557e6aa61e7e16ed4a8d785ad5fe651b3d8..83bf443ca158c07e05075777da02b7f2
 +    tabData.zenDefaultUserContextId = tab.getAttribute("zenDefaultUserContextId");
 +    tabData.zenPinnedEntry = tab.getAttribute("zen-pinned-entry");
 +    tabData.zenPinnedIcon = tab.getAttribute("zen-pinned-icon");
++    tabData.zenHasStaticLabel = tab.getAttribute("zen-has-static-label");
 +
      tabData.searchMode = tab.ownerGlobal.gURLBar.getSearchMode(browser, true);
  
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 56bb251ba..a78d75c7e 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b1c975652 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9cd3aacffe 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -144,7 +144,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3403,6 +3455,21 @@
+@@ -3403,6 +3455,24 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -162,11 +162,14 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
 +          }
 +          if (tabData.zenPinnedEntry) {
 +            tab.setAttribute("zen-pinned-entry", tabData.zenPinnedEntry);
++          }
++          if (tabData.zenHasStaticLabel) {
++            tab.setAttribute("zen-has-static-label", "true");
 +          }
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3416,6 +3483,7 @@
+@@ -3416,6 +3486,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -174,7 +177,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3451,7 +3519,21 @@
+@@ -3451,7 +3522,24 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -193,11 +196,14 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
 +          }
 +          if (tabData.zenPinnedEntry) {
 +            tab.setAttribute("zen-pinned-entry", tabData.zenPinnedEntry);
++          }
++          if (tabData.zenHasStaticLabel) {
++            tab.setAttribute("zen-has-static-label", "true");
 +          }
            if (select) {
              tabToSelect = tab;
            }
-@@ -3729,7 +3811,7 @@
+@@ -3729,7 +3817,7 @@
        // Ensure we have an index if one was not provided.
        if (typeof index != "number") {
          // Move the new tab after another tab if needed, to the end otherwise.
@@ -206,7 +212,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3780,7 +3862,7 @@
+@@ -3780,7 +3868,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
@@ -215,7 +221,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        this.tabContainer._invalidateCachedTabs();
  
        if (tabGroup) {
-@@ -4095,6 +4177,9 @@
+@@ -4095,6 +4183,9 @@
          return;
        }
  
@@ -225,7 +231,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        this.removeTabs(selectedTabs);
      }
  
-@@ -4427,6 +4512,7 @@
+@@ -4427,6 +4518,7 @@
          skipSessionStore,
        } = {}
      ) {
@@ -233,7 +239,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        if (UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.finish("browser.tabs.opening", window);
        }
-@@ -4443,6 +4529,12 @@
+@@ -4443,6 +4535,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -246,7 +252,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4549,9 @@
+@@ -4457,7 +4555,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -257,7 +263,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4565,6 @@
+@@ -4471,7 +4571,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -265,7 +271,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4703,14 @@
+@@ -4610,14 +4709,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -282,7 +288,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5558,10 @@
+@@ -5465,10 +5564,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -295,7 +301,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5727,6 +5820,9 @@
+@@ -5727,6 +5826,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -305,7 +311,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -7443,6 +7539,7 @@
+@@ -7443,6 +7545,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -313,7 +319,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8508,7 @@ var TabContextMenu = {
+@@ -8411,7 +8514,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -322,7 +328,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8541,7 @@ var TabContextMenu = {
+@@ -8444,7 +8547,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -331,7 +337,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..838542e31112c7c3b5e9049da4a2cb6b
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8774,7 @@ var TabContextMenu = {
+@@ -8677,6 +8780,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {

From 508812914f69d17625c6db3969c0d3a63b99bf1d Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Sun, 9 Feb 2025 21:56:22 +0800
Subject: [PATCH 07/44] Changed listener to tabContainer.addEventListener

---
 src/browser/base/content/ZenUIManager.mjs | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index e0e1dfa44..356286927 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -232,7 +232,8 @@ var gZenVerticalTabsManager = {
       tabs.addEventListener('mouseup', this.openNewTabOnTabsMiddleClick.bind(this));
     }
 
-    this._insertDoubleClickListenerPinnedTabs();
+    //this._insertDoubleClickListenerPinnedTabs();
+    gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
 
   openNewTabOnTabsMiddleClick(event) {
@@ -601,12 +602,12 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-  _insertDoubleClickListenerPinnedTabs() {
-    const tabs = gBrowser.tabs;
-    for (const tab of tabs) {
-      tab.addEventListener('dblclick', this.renameTabStart.bind(this));
-    }
-  },
+  //_insertDoubleClickListenerPinnedTabs() {
+  //  const tabs = gBrowser.tabs;
+  //  for (const tab of tabs) {
+  //    tab.addEventListener('dblclick', this.renameTabStart.bind(this));
+  //  }
+  //},
 
   renameTabKeydown(event) {
     if (event.key === 'Enter') {
@@ -647,7 +648,7 @@ var gZenVerticalTabsManager = {
   renameTabStart(event) {
     if (this._tabEdited) return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    if (!this._tabEdited.pinned) {
+    if (!this._tabEdited || !this._tabEdited.pinned) {
       this._tabEdited = null;
       return;
     }

From f37e80535ab931b81448b0de5bc92eebe0cb4900 Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Tue, 11 Feb 2025 12:26:00 +0800
Subject: [PATCH 08/44] Added preference to disable tab renaming, refactored
 inline styles to css files, changed listener to blur, refactored code

---
 src/browser/app/profile/zen-browser.js        |  1 +
 src/browser/base/content/ZenUIManager.mjs     | 54 ++++++-------------
 .../zen-styles/zen-tabs/vertical-tabs.css     | 11 ++++
 .../tabbrowser/content/tabbrowser-js.patch    | 11 +++-
 4 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index c4a5b7c59..442d59e72 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -80,6 +80,7 @@ pref('zen.welcome-screen.seen', false);
 
 pref('zen.tabs.vertical', true);
 pref('zen.tabs.vertical.right-side', false);
+pref('zen.tabs.rename-tabs', true);
 pref('zen.theme.accent-color', "#ffb787");
 pref('zen.theme.content-element-separation', 6); // In pixels
 pref('zen.theme.pill-button', false);
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index dd2ed94f6..4c0fa5adc 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -186,7 +186,6 @@ var gZenUIManager = {
 };
 
 var gZenVerticalTabsManager = {
-  _tabEdited: null,
   init() {
     this._multiWindowFeature = new ZenMultiWindowFeature();
     this._initWaitPromise();
@@ -224,7 +223,8 @@ var gZenVerticalTabsManager = {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
     }
 
-    //this._insertDoubleClickListenerPinnedTabs();
+    this._tabEdited = null;
+    this._renameTabHalt = this.renameTabHalt.bind(this);
     gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
 
@@ -586,13 +586,6 @@ var gZenVerticalTabsManager = {
     target.appendChild(child);
   },
 
-  //_insertDoubleClickListenerPinnedTabs() {
-  //  const tabs = gBrowser.tabs;
-  //  for (const tab of tabs) {
-  //    tab.addEventListener('dblclick', this.renameTabStart.bind(this));
-  //  }
-  //},
-
   renameTabKeydown(event) {
     if (event.key === 'Enter') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
@@ -604,41 +597,37 @@ var gZenVerticalTabsManager = {
         this._tabEdited.label = newName;
         this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
-        // If the page is loaded, get the title of the page. Otherwise, keep name as is
-        this._tabEdited.label = gBrowser.getBrowserForTab(this._tabEdited).contentTitle || this._tabEdited.label;
-        // If the page had a title, reset the zen-has-static-label attribute
-        if (gBrowser.getBrowserForTab(this._tabEdited).contentTitle) {
-          this._tabEdited.removeAttribute('zen-has-static-label');
-        }
+        this._tabEdited.removeAttribute('zen-has-static-label');
+        gBrowser.setTabTitle(this._tabEdited);
       }
 
       this._tabEdited.querySelector('.tab-editor-container').remove();
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.renameTabHalt.bind(this));
+      label.classList.remove('tab-label-container-editing');
 
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
       let label = this._tabEdited.querySelector('.tab-label-container-editing');
       this._tabEdited.querySelector('.tab-editor-container').remove();
 
-      label.style.display = '';
-      label.className = label.className.replace(' tab-label-container-editing', '');
-      document.removeEventListener('click', this.renameTabHalt.bind(this));
+      label.classList.remove('tab-label-container-editing');
       this._tabEdited = null;
     }
   },
 
   renameTabStart(event) {
-    if (this._tabEdited) return;
+    if (
+      this._tabEdited ||
+      !Services.prefs.getBoolPref('zen.tabs.rename-tabs') ||
+      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick')
+    )
+      return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');
-    if (!this._tabEdited || !this._tabEdited.pinned) {
+    if (!this._tabEdited || !this._tabEdited.pinned || this._tabEdited.hasAttribute('zen-essential')) {
       this._tabEdited = null;
       return;
     }
     const label = this._tabEdited.querySelector('.tab-label-container');
-    label.style.display = 'none';
-    label.className += ' tab-label-container-editing';
+    label.classList.add('tab-label-container-editing');
 
     const container = window.MozXULElement.parseXULToFragment(`
       <vbox class="tab-label-container tab-editor-container" flex="1" align="start" pack="center"></vbox>
@@ -649,31 +638,22 @@ var gZenVerticalTabsManager = {
     input.id = 'tab-label-input';
     input.value = this._tabEdited.label;
     input.addEventListener('keydown', this.renameTabKeydown.bind(this));
-    input.style['white-space'] = 'nowrap';
-    input.style['overflow-x'] = 'scroll';
-    input.style['margin'] = '0';
 
     containerHtml.appendChild(input);
     input.focus();
     input.select();
 
-    document.addEventListener('click', this.renameTabHalt.bind(this));
+    input.addEventListener('blur', this._renameTabHalt);
   },
 
   renameTabHalt(event) {
-    // Ignore click event if it's clicking the input
-    if (event.target.closest('#tab-label-input')) {
-      return;
-    }
-    if (!this._tabEdited) {
+    if (document.activeElement === event.target || !this._tabEdited) {
       return;
     }
     this._tabEdited.querySelector('.tab-editor-container').remove();
     const label = this._tabEdited.querySelector('.tab-label-container-editing');
-    label.style.display = '';
-    label.className = label.className.replace(' tab-label-container-editing', '');
+    label.classList.remove('tab-label-container-editing');
 
-    document.removeEventListener('click', this.renameTabHalt.bind(this));
     this._tabEdited = null;
   },
 };
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index e08650a78..03344faa4 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1143,3 +1143,14 @@
 #zen-essentials-container .tabbrowser-tab.drag-over-after {
   box-shadow: -3px 0 6px -2px var(--toolbarbutton-active-background, rgba(0, 255, 0, 0.2));
 }
+
+/* Renaming tab */
+.tab-label-container-editing {
+  display: none !important;
+}
+
+#tab-label-input {
+  white-space: nowrap;
+  overflow-x: scroll;
+  margin: 0;
+}
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index a78d75c7e..778fd492f 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9cd3aacffe 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c29a3620f85219074b2eeef8d75b4ca7232414e2 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -90,6 +90,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..4faba37097f376b57c7376e320f46e9c
          if (!keepFocusOnUrlBar) {
            // Clear focus so that _adjustFocusAfterTabSwitch can detect if
            // some element has been focused and respect that.
+@@ -1785,7 +1822,7 @@
+     }
+ 
+     _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
+-      if (!aLabel || aLabel.includes("about:reader?")) {
++      if (!aLabel || aLabel.includes("about:reader?") || aTab.hasAttribute("zen-has-static-label")) {
+         return false;
+       }
+ 
 @@ -2387,7 +2424,7 @@
  
        let panel = this.getPanel(browser);

From 22cad83c8fc08c565734e9cd0af8d1c9fce0ea06 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 10:58:53 +0100
Subject: [PATCH 09/44] Fixed creating a new workspace in the new system

---
 src/browser/base/content/zen-styles/zen-workspaces.css | 2 +-
 src/browser/base/zen-components/ZenWorkspaces.mjs      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 9fbe38108..32f2a7c9a 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -456,7 +456,7 @@
   position: absolute;
   max-height: var(--zen-workspace-indicator-height);
   min-height: var(--zen-workspace-indicator-height);
-  gap: 5px;
+  gap: 12px;
   overflow: hidden;
   text-overflow: ellipsis;
   flex-direction: row !important;
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 117a3dd15..636ab27d8 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1703,9 +1703,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     };
     this._prepareNewWorkspace(window);
     const perifery = document.querySelector('#tabbrowser-arrowscrollbox-periphery[hidden]');
-    preifery?.removeAttribute('hidden');
+    perifery?.removeAttribute('hidden');
     this._createWorkspaceTabsSection(window, [], perifery);
-    preifery.setAttribute('hidden', 'true');
+    perifery.setAttribute('hidden', 'true');
     return window;
   }
 

From 40a843200f3abba7aeb94d95c08db014542cb855 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 12:39:13 +0100
Subject: [PATCH 10/44] Fixed unpinning tabs

---
 .../content/zen-styles/zen-tabs/vertical-tabs.css     |  2 +-
 src/browser/base/zen-components/ZenWorkspaces.mjs     | 11 ++++++-----
 .../components/tabbrowser/content/tabbrowser-js.patch | 10 +++++++---
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index b18d303c6..56415a234 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -369,7 +369,7 @@
 #zen-browser-tabs-wrapper {
   min-height: fit-content;
   overflow-y: auto;
-  overflow-x: hidden;
+  overflow-x: clip;
   height: 100%;
   scrollbar-width: thin;
 }
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 636ab27d8..50a830328 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -359,7 +359,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     event.preventDefault();
     event.stopPropagation();
 
-    const delta = event.delta * 500;
+    const delta = event.delta * 300;
     this._swipeState.lastDelta = delta;
 
     if (Math.abs(delta) > 1) {
@@ -1625,9 +1625,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       this._lastSelectedWorkspaceTabs[window.uuid] = newTab;
     }
     // Always make sure we always unselect the tab from the old workspace
-    currentSelectedTab._selected = false;
-    currentSelectedTab._visuallySelected = true; // we do want to animate the tab deselection
-    this._beforeSelectedTab = currentSelectedTab;
+    if (currentSelectedTab && currentSelectedTab !== tabToSelect) {
+      currentSelectedTab._selected = false;
+      currentSelectedTab._visuallySelected = true; // we do want to animate the tab deselection
+      this._beforeSelectedTab = currentSelectedTab;
+    }
   }
 
   async _updateWorkspaceState(window, onInit) {
@@ -1639,7 +1641,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     // Update workspace UI
     await this._updateWorkspacesChangeContextMenu();
-    document.getElementById('tabbrowser-tabs')._positionPinnedTabs();
     gZenUIManager.updateTabsToolbar();
     await this._propagateWorkspaceData({ clearCache: false });
 
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index e5ba04639..1e2d0b8fc 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6eeb57088 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cbeb4472fdc7dc12c2a45a0c578d166c1cac1b6b 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -57,8 +57,12 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6
        }
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -831,7 +859,7 @@
-           this.tabContainer.arrowScrollbox.prepend(aTab);
+@@ -828,10 +856,10 @@
+           // the moving of a tab from the vertical pinned tabs container
+           // and back into arrowscrollbox.
+           aTab.removeAttribute("pinned");
+-          this.tabContainer.arrowScrollbox.prepend(aTab);
++          ZenWorkspaces.activeWorkspaceStrip.prepend(aTab);
          });
        } else {
 -        this.moveTabTo(aTab, this.pinnedTabCount - 1, {

From bd4f9788ccb851cd4300ea5c188f0981f1e06cbb Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 13:16:20 +0100
Subject: [PATCH 11/44] Fixed urlbar glitching when focusing in compact mode

---
 src/browser/components/urlbar/UrlbarInput-sys-mjs.patch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index f395eaa62..3871b2fe8 100644
--- a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
+++ b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/urlbar/UrlbarInput.sys.mjs b/browser/components/urlbar/UrlbarInput.sys.mjs
-index 50968dc04b527438acf30151f0c2e92f8b45097c..ea9207399b205c84d1263a4de8a63b776e36eabd 100644
+index 50968dc04b527438acf30151f0c2e92f8b45097c..f8587b68ac057bb0f829fc21f08ade6605b14c92 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -67,6 +67,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -20,7 +20,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..ea9207399b205c84d1263a4de8a63b77
      // See _on_select().  HTMLInputElement.select() dispatches a "select"
      // event but does not set the primary selection.
      this._suppressPrimaryAdjustment = true;
-+    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", true);
++    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", !this.document.getElementById("navigator-toolbox").hasAttribute("zen-has-hover"));
      this.inputField.select();
 +    this.document.ownerGlobal.setTimeout(() => {
 +      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");
@@ -44,7 +44,7 @@ index 50968dc04b527438acf30151f0c2e92f8b45097c..ea9207399b205c84d1263a4de8a63b77
        }
      }
 -
-+    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", true);
++    this.document.getElementById("navigator-toolbox").setAttribute("supress-primary-adjustment", !this.document.getElementById("navigator-toolbox").hasAttribute("zen-has-hover"));
      this.handleNavigation({ event });
 +    this.document.ownerGlobal.setTimeout(() => {
 +      this.document.getElementById("navigator-toolbox").removeAttribute("supress-primary-adjustment");

From 23d9487ca7957b5608682ccd54722eee1baa14ac Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 15:35:37 +0100
Subject: [PATCH 12/44] Fixed pinned tabs separator using the wrong tabs when
 hiding

---
 .../zen-styles/zen-tabs/vertical-tabs.css        |  3 +--
 .../base/zen-components/ZenWorkspaces.mjs        | 16 ++++++++++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 56415a234..2c530b8df 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -126,8 +126,7 @@
   width: 98%;
   transition: margin 0.2s ease-in-out, background 0.2s ease-in-out, max-height 0.2s ease-in-out;
 
-  #vertical-pinned-tabs-container .zen-workspace-tabs-section[active]:not(:has(tab:not([hidden]))) &,
-  #tabbrowser-tabs:not(:has(#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[active] tab:not([hidden]))) & {
+  #vertical-pinned-tabs-container .zen-workspace-tabs-section[hide-separator] & {
     max-height: 0;
     margin: 0 auto;
   }
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 50a830328..4535abca0 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -509,6 +509,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       this._initializeWorkspaceTabContextMenus();
       await this.workspaceBookmarks();
       window.addEventListener('TabBrowserInserted', this.onTabBrowserInserted.bind(this));
+      window.addEventListener('TabOpen', this.updateTabsContainers.bind(this));
+      window.addEventListener('TabClose', this.updateTabsContainers.bind(this));
       let workspaces = await this._workspaces();
       let activeWorkspace = null;
       if (workspaces.workspaces.length === 0) {
@@ -1721,6 +1723,19 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     return workspaceData;
   }
 
+  updateTabsContainers() {
+    this.onPinnedTabsResize([this.pinnedTabsContainer]);
+  }
+
+  updateShouldHideSeparator(arrowScrollbox, pinnedContainer) {
+    const shouldHideSeparator = pinnedContainer.children.length === 1 || arrowScrollbox.children.length === 1;
+    if (shouldHideSeparator) {
+      pinnedContainer.setAttribute('hide-separator', 'true');
+    } else {
+      pinnedContainer.removeAttribute('hide-separator');
+    }
+  }
+
   onPinnedTabsResize(entries) {
     if (!this.workspaceEnabled) {
       return;
@@ -1731,6 +1746,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         `#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[zen-workspace-id="${workspaceId}"]`
       );
       this._updateMarginTopPinnedTabs(arrowScrollbox, entry.target);
+      this.updateShouldHideSeparator(arrowScrollbox, entry.target);
     }
   }
 

From aebc2c9660957926eba04cb654ca1eac835ac8c8 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Wed, 12 Feb 2025 15:36:59 +0100
Subject: [PATCH 13/44] Fixed handling tab opens/close on workspaces

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 4535abca0..803854dd5 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1724,7 +1724,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   updateTabsContainers() {
-    this.onPinnedTabsResize([this.pinnedTabsContainer]);
+    this.onPinnedTabsResize([{ target: this.pinnedTabsContainer }]);
   }
 
   updateShouldHideSeparator(arrowScrollbox, pinnedContainer) {

From 9f6fbc5e57616d8a0daf9bafc304a0b8f9957047 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 12 Feb 2025 20:03:00 +0100
Subject: [PATCH 14/44] Refactor tab handling and session restore logic for
 improved workspace management

---
 .../zen-styles/zen-tabs/vertical-tabs.css     |  4 +-
 .../base/zen-components/ZenWorkspaces.mjs     | 41 ++++++++++++++++++-
 .../sessionstore/SessionStore-sys-mjs.patch   | 13 +++++-
 .../tabbrowser/content/tabbrowser-js.patch    | 10 ++---
 .../tabbrowser/content/tabs-js.patch          | 37 +++++++++--------
 surfer.json                                   |  2 +-
 6 files changed, 79 insertions(+), 28 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 2c530b8df..68c7d8624 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -371,6 +371,7 @@
   overflow-x: clip;
   height: 100%;
   scrollbar-width: thin;
+  position: relative;
 }
 
 #vertical-pinned-tabs-container {
@@ -378,7 +379,8 @@
   display: flex !important;
   flex-direction: column;
   min-height: fit-content !important;
-  overflow: visible;
+  overflow-x: clip;
+  overflow-y: visible;
   max-height: unset !important;
 
   & .tabbrowser-tab:not(:hover) .tab-background:not([selected]):not([multiselected]) {
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 803854dd5..9ecf698ed 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1308,7 +1308,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
     tab.setAttribute('zen-workspace-id', workspaceID);
     const parent = tab.pinned ? '#zen-browser-tabs-pinned ' : '#zen-browser-tabs ';
-    const container = document.querySelector(parent + '.zen-browser-tabs-container');
+    const container = document.querySelector(parent + '.zen-workspace-tabs-section');
     if (container) {
       container.insertBefore(tab, container.firstChild);
     }
@@ -2043,4 +2043,43 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     // Return true only if the bookmark is in another workspace and not in the active one
     return isInOtherWorkspace && !isInActiveWorkspace;
   }
+
+  // Session restore functions
+  get allStoredTabs() {
+    if (!this._hasInitializedTabsStrip) {
+      const children = Array.from(this.tabboxChildren);
+      children.pop(); // Remove the last child which is the new tab button
+      return children;
+    }
+
+    const tabs = [];
+    // we need to go through each tab in each container
+    const essentialsContainer = document.getElementById('zen-essentials-container');
+    const pinnedContainers = document.querySelectorAll('#vertical-pinned-tabs-container .zen-workspace-tabs-section');
+    const normalContainers = document.querySelectorAll('#tabbrowser-arrowscrollbox .zen-workspace-tabs-section');
+    const containers = [essentialsContainer, ...pinnedContainers, ...normalContainers];
+    for (const container of containers) {
+      for (const tab of container.children) {
+        if (tab.tagName === 'tab' || tab.tagName == 'tab-group') {
+          tabs.push(tab);
+        }
+      }
+    }
+    return tabs;
+  }
+
+  get pinnedTabCount() {
+    return this.pinnedTabsContainer.children.length - 1;
+  }
+
+  get normalTabCount() {
+    return this.tabboxChildren.length - 1;
+  }
+
+  get allWorkspaceTabs() {
+    const currentWorkspace = this.activeWorkspace;
+    return this.allStoredTabs.filter(
+      (tab) => tab.hasAttribute('zen-essential') || tab.getAttribute('zen-workspace-id') === currentWorkspace
+    );
+  }
 })();
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index 85c7071f7..2c7b2688f 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 8125c1afc07f3365a2ad030adaf6a560453d7fe6..2856c5f93bfc9d68b98e09b2f26e3d5266c1f46a 100644
+index 908743177d9f95e2e6549c689e7a493ca8668701..b452d7dfc93f6171f8a65668e052a37638f1f6c3 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
-@@ -3679,6 +3679,7 @@ var SessionStoreInternal = {
+@@ -3848,6 +3848,7 @@ var SessionStoreInternal = {
          aWindow.gBrowser.selectedTab = newTab;
        }
  
@@ -10,3 +10,12 @@ index 8125c1afc07f3365a2ad030adaf6a560453d7fe6..2856c5f93bfc9d68b98e09b2f26e3d52
        // Restore the state into the new tab.
        this.restoreTab(newTab, tabState, {
          restoreImmediately: aRestoreImmediately,
+@@ -5315,7 +5316,7 @@ var SessionStoreInternal = {
+     }
+ 
+     let tabbrowser = aWindow.gBrowser;
+-    let tabs = tabbrowser.tabs;
++    let tabs = aWindow.ZenWorkspaces.allStoredTabs;
+     /** @type {WindowStateData} */
+     let winData = this._windows[aWindow.__SSi];
+     let tabsData = (winData.tabs = []);
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 1e2d0b8fc..e5ba04639 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cbeb4472fdc7dc12c2a45a0c578d166c1cac1b6b 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6eeb57088 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -57,12 +57,8 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..cbeb4472fdc7dc12c2a45a0c578d166c
        }
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -828,10 +856,10 @@
-           // the moving of a tab from the vertical pinned tabs container
-           // and back into arrowscrollbox.
-           aTab.removeAttribute("pinned");
--          this.tabContainer.arrowScrollbox.prepend(aTab);
-+          ZenWorkspaces.activeWorkspaceStrip.prepend(aTab);
+@@ -831,7 +859,7 @@
+           this.tabContainer.arrowScrollbox.prepend(aTab);
          });
        } else {
 -        this.moveTabTo(aTab, this.pinnedTabCount - 1, {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 149134733..dfafb0b6c 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67709dae7d 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b20e112db 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -209,7 +209,12 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
            if (tab && rect(tab).width <= this._tabClipWidth) {
              this.setAttribute("closebuttons", "activetab");
            } else {
-@@ -1832,6 +1858,7 @@
+@@ -1828,10 +1854,12 @@
+ 
+     _handleTabSelect(aInstant) {
+       let selectedTab = this.selectedItem;
++      if (!selectedTab) return;
+       if (this.overflowing) {
          this.arrowScrollbox.ensureElementIsVisible(selectedTab, aInstant);
        }
  
@@ -217,7 +222,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
        selectedTab._notselectedsinceload = false;
      }
  
-@@ -1843,7 +1870,7 @@
+@@ -1843,7 +1871,7 @@
          return;
        }
  
@@ -226,7 +231,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
        if (!tabs.length) {
          return;
        }
-@@ -1879,7 +1906,7 @@
+@@ -1879,7 +1907,7 @@
          if (isEndTab && !this._hasTabTempMaxWidth) {
            return;
          }
@@ -235,7 +240,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          // Force tabs to stay the same width, unless we're closing the last tab,
          // which case we need to let them expand just enough so that the overall
          // tabbar width is the same.
-@@ -1894,7 +1921,7 @@
+@@ -1894,7 +1922,7 @@
          let tabsToReset = [];
          for (let i = numPinned; i < tabs.length; i++) {
            let tab = tabs[i];
@@ -244,7 +249,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
            if (!isEndTab) {
              // keep tabs the same width
              tab.style.transition = "none";
-@@ -1960,16 +1987,15 @@
+@@ -1960,16 +1988,15 @@
        // Move pinned tabs to another container when the tabstrip is toggled to vertical
        // and when session restore code calls _positionPinnedTabs; update styling whenever
        // the number of pinned tabs changes.
@@ -266,7 +271,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          }
        }
  
-@@ -1977,9 +2003,7 @@
+@@ -1977,9 +2004,7 @@
      }
  
      _resetVerticalPinnedTabs() {
@@ -277,7 +282,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
  
        if (!verticalTabsContainer.children.length) {
          return;
-@@ -1992,8 +2016,8 @@
+@@ -1992,8 +2017,8 @@
      }
  
      _positionPinnedTabs() {
@@ -288,7 +293,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2098,7 @@
+@@ -2074,7 +2099,7 @@
          return;
        }
  
@@ -297,7 +302,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2281,9 @@
+@@ -2257,9 +2282,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -310,7 +315,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2526,9 @@
+@@ -2502,8 +2527,9 @@
        );
      }
  
@@ -322,7 +327,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          return;
        }
  
-@@ -2668,9 +2693,9 @@
+@@ -2668,9 +2694,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -334,7 +339,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
        }
      }
  
-@@ -2754,7 +2779,7 @@
+@@ -2754,7 +2780,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -343,7 +348,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
          return;
        }
  
-@@ -2772,12 +2797,14 @@
+@@ -2772,12 +2798,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -359,7 +364,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
                selectedTab,
              ];
            })
-@@ -2794,8 +2821,11 @@
+@@ -2794,8 +2822,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -373,7 +378,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..ab0a6a6ed80608385b4663775b4edf67
              ) {
                return;
              }
-@@ -2803,21 +2833,29 @@
+@@ -2803,21 +2834,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (
diff --git a/surfer.json b/surfer.json
index 96ac3b992..8b97e5388 100644
--- a/surfer.json
+++ b/surfer.json
@@ -53,4 +53,4 @@
     "licenseType": "MPL-2.0"
   },
   "updateHostname": "updates.zen-browser.app"
-}
+}
\ No newline at end of file

From d16992f5b21ea5e3bb2aff560a0eda5a541ef606 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 12 Feb 2025 20:05:56 +0100
Subject: [PATCH 15/44] Force overflow-x clipping in vertical tabs to ensure
 consistent styling

---
 src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 68c7d8624..a5ca41b3f 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -368,7 +368,7 @@
 #zen-browser-tabs-wrapper {
   min-height: fit-content;
   overflow-y: auto;
-  overflow-x: clip;
+  overflow-x: clip !important; /* might break custom css with new design, so let's force it */
   height: 100%;
   scrollbar-width: thin;
   position: relative;

From 8b98469936ff756cb4c53a22dfb3382555aa1a5d Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Wed, 12 Feb 2025 21:38:05 +0100
Subject: [PATCH 16/44] Added support for acrylic backgrounds for windows 11
 with mica support

---
 .../libpref/init/StaticPrefList-yaml.patch    | 13 +++++++++---
 src/widget/windows/nsWindow-cpp.patch         | 21 +++++++++++++++++++
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 src/widget/windows/nsWindow-cpp.patch

diff --git a/src/modules/libpref/init/StaticPrefList-yaml.patch b/src/modules/libpref/init/StaticPrefList-yaml.patch
index 6d3166133..fadcff2b1 100644
--- a/src/modules/libpref/init/StaticPrefList-yaml.patch
+++ b/src/modules/libpref/init/StaticPrefList-yaml.patch
@@ -1,8 +1,8 @@
 diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml
-index 5c5992d7b32e4c16d6a92815ca6fd54e8fcec824..6c8e67e36f02b578c800fa460868135afb73c66b 100644
+index 7364514f74703184462e8dbce3f0aafc3f850a3d..560671beddf6c216e918a47bd5dbd4e770a24ec7 100644
 --- a/modules/libpref/init/StaticPrefList.yaml
 +++ b/modules/libpref/init/StaticPrefList.yaml
-@@ -17810,7 +17810,7 @@
+@@ -18067,7 +18067,7 @@
  # Whether we use the mica backdrop. Off by default for now.
  - name: widget.windows.mica
    type: bool
@@ -11,7 +11,7 @@ index 5c5992d7b32e4c16d6a92815ca6fd54e8fcec824..6c8e67e36f02b578c800fa460868135a
    mirror: once
  #endif
  
-@@ -17923,6 +17923,19 @@
+@@ -18180,6 +18180,26 @@
    mirror: always
  #endif
  
@@ -27,6 +27,13 @@ index 5c5992d7b32e4c16d6a92815ca6fd54e8fcec824..6c8e67e36f02b578c800fa460868135a
 +  value: false
 +  mirror: always
 +#endif
++
++#ifdef XP_WIN
++- name: zen.widget.windows.acrylic
++  type: bool
++  value: true
++  mirror: once
++#endif
 +
  #---------------------------------------------------------------------------
  # Prefs starting with "zoom."
diff --git a/src/widget/windows/nsWindow-cpp.patch b/src/widget/windows/nsWindow-cpp.patch
new file mode 100644
index 000000000..99fe82efa
--- /dev/null
+++ b/src/widget/windows/nsWindow-cpp.patch
@@ -0,0 +1,21 @@
+diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp
+index b735e78b1c2f3e0d85a5224311cdc746007c7eac..50f3c6e40b11220b71a8a3811305661887bb4360 100644
+--- a/widget/windows/nsWindow.cpp
++++ b/widget/windows/nsWindow.cpp
+@@ -165,6 +165,7 @@
+ #include "mozilla/StaticPrefs_layout.h"
+ #include "mozilla/StaticPrefs_ui.h"
+ #include "mozilla/StaticPrefs_widget.h"
++#include "mozilla/StaticPrefs_zen.h"
+ #include "nsNativeAppSupportWin.h"
+ 
+ #include "nsIGfxInfo.h"
+@@ -1071,7 +1072,7 @@ nsresult nsWindow::Create(nsIWidget* aParent, const LayoutDeviceIntRect& aRect,
+ 
+   if (WinUtils::MicaEnabled() && !IsPopup()) {
+     // Enable Mica Alt Material if available.
+-    const DWM_SYSTEMBACKDROP_TYPE tabbedWindow = DWMSBT_TABBEDWINDOW;
++    const DWM_SYSTEMBACKDROP_TYPE tabbedWindow = StaticPrefs::zen_widget_windows_acrylic_AtStartup() ? DWMSBT_TRANSIENTWINDOW : DWMSBT_TABBEDWINDOW;
+     DwmSetWindowAttribute(mWnd, DWMWA_SYSTEMBACKDROP_TYPE, &tabbedWindow,
+                           sizeof tabbedWindow);
+   }

From 539535e66ff6058b8c25a569026d443f891ef4fe Mon Sep 17 00:00:00 2001
From: jso8910 <mail4jasonr@gmail.com>
Date: Thu, 13 Feb 2025 08:32:13 +0800
Subject: [PATCH 17/44] Deactivated listener in collapsed sidebar mode,
 refactored code

---
 src/browser/base/content/ZenUIManager.mjs | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 93d919e99..2bb409f25 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -246,7 +246,6 @@ var gZenVerticalTabsManager = {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
     }
 
-    this._tabEdited = null;
     this._renameTabHalt = this.renameTabHalt.bind(this);
     gBrowser.tabContainer.addEventListener('dblclick', this.renameTabStart.bind(this));
   },
@@ -619,7 +618,7 @@ var gZenVerticalTabsManager = {
 
       // Check if name is blank, reset if so
       if (newName) {
-        this._tabEdited.label = newName;
+        gBrowser._setTabLabel(this._tabEdited, newName);
         this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
         this._tabEdited.removeAttribute('zen-has-static-label');
@@ -631,11 +630,7 @@ var gZenVerticalTabsManager = {
 
       this._tabEdited = null;
     } else if (event.key === 'Escape') {
-      let label = this._tabEdited.querySelector('.tab-label-container-editing');
-      this._tabEdited.querySelector('.tab-editor-container').remove();
-
-      label.classList.remove('tab-label-container-editing');
-      this._tabEdited = null;
+      event.target.blur();
     }
   },
 
@@ -643,7 +638,8 @@ var gZenVerticalTabsManager = {
     if (
       this._tabEdited ||
       !Services.prefs.getBoolPref('zen.tabs.rename-tabs') ||
-      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick')
+      Services.prefs.getBoolPref('browser.tabs.closeTabByDblclick') ||
+      !gZenVerticalTabsManager._prefsSidebarExpanded
     )
       return;
     this._tabEdited = event.target.closest('.tabbrowser-tab');

From 4f41aab3fabebce9b90eab7f8adf411da788b280 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 13 Feb 2025 11:00:56 +0100
Subject: [PATCH 18/44] merge

---
 .../base/zen-components/ZenWorkspaces.mjs     | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 803854dd5..2fa911df9 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1440,11 +1440,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     // Second pass: Handle tab selection
     this.tabContainer._invalidateCachedTabs();
-    await this._handleTabSelection(window, onInit, containerId, workspaces, previousWorkspace.uuid);
-    this.tabContainer._updateVerticalPinnedTabs();
+    const tabToSelect = await this._handleTabSelection(window, onInit, containerId, workspaces, previousWorkspace.uuid);
 
     // Update UI and state
-    await this._updateWorkspaceState(window, onInit);
+    await this._updateWorkspaceState(window, onInit, tabToSelect);
   }
 
   _updateMarginTopPinnedTabs(arrowscrollbox, pinnedContainer) {
@@ -1540,10 +1539,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
     }
     await Promise.all(animations);
-    if (this._beforeSelectedTab) {
-      this._beforeSelectedTab._visuallySelected = false;
-      this._beforeSelectedTab = null;
-    }
     this._animatingChange = false;
   }
 
@@ -1617,21 +1612,19 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
 
     // If we found a tab to select, select it
-    if (tabToSelect) {
-      gBrowser.selectedTab = tabToSelect;
-      this._lastSelectedWorkspaceTabs[window.uuid] = tabToSelect;
-    } else if (!onInit) {
+    if (!onInit && !tabToSelect) {
       // Create new tab if needed and no suitable tab was found
       const newTab = this._createNewTabForWorkspace(window);
-      gBrowser.selectedTab = newTab;
-      this._lastSelectedWorkspaceTabs[window.uuid] = newTab;
+      tabToSelect = newTab;
     }
+    tabToSelect._visuallySelected = true;
+    this._lastSelectedWorkspaceTabs[window.uuid] = tabToSelect;
+
     // Always make sure we always unselect the tab from the old workspace
     if (currentSelectedTab && currentSelectedTab !== tabToSelect) {
       currentSelectedTab._selected = false;
-      currentSelectedTab._visuallySelected = true; // we do want to animate the tab deselection
-      this._beforeSelectedTab = currentSelectedTab;
     }
+    return tabToSelect;
   }
 
   async _updateWorkspaceState(window, onInit) {
@@ -1659,7 +1652,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._invalidateBookmarkContainers();
 
     // Update workspace indicator
-    await this.updateWorkspaceIndicator();
+    await this.updateWorkspaceIndicator(window, this.workspaceIndicator);
   }
 
   _invalidateBookmarkContainers() {

From ab836eb762606f1aba1df2ee0676c06f953f239d Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 13 Feb 2025 11:16:16 +0100
Subject: [PATCH 19/44] Fixed workspace switching

---
 src/browser/base/zen-components/ZenGradientGenerator.mjs | 1 -
 src/browser/base/zen-components/ZenWorkspaces.mjs        | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/browser/base/zen-components/ZenGradientGenerator.mjs b/src/browser/base/zen-components/ZenGradientGenerator.mjs
index 125c45da7..963f87f76 100644
--- a/src/browser/base/zen-components/ZenGradientGenerator.mjs
+++ b/src/browser/base/zen-components/ZenGradientGenerator.mjs
@@ -37,7 +37,6 @@
       this.initCanvas();
       this.initCustomColorInput();
 
-      ZenWorkspaces.addChangeListeners(this.onWorkspaceChange.bind(this));
       window.matchMedia('(prefers-color-scheme: dark)').addListener(this.onDarkModeChange.bind(this));
     }
 
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 9aeeeabb7..421f46a8a 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1627,7 +1627,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     return tabToSelect;
   }
 
-  async _updateWorkspaceState(window, onInit) {
+  async _updateWorkspaceState(window, onInit, tabToSelect) {
     // Update document state
     document.documentElement.setAttribute('zen-workspace-id', window.uuid);
 
@@ -1639,6 +1639,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     gZenUIManager.updateTabsToolbar();
     await this._propagateWorkspaceData({ clearCache: false });
 
+    gZenThemePicker.onWorkspaceChange(window);
+
+    await this._animateTabs(window, !onInit && !this._animatingChange);
+    gBrowser.selectedTab = tabToSelect;
+
     // Notify listeners
     if (this._changeListeners?.length) {
       for (const listener of this._changeListeners) {
@@ -1646,8 +1651,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
     }
 
-    await this._animateTabs(window, !onInit && !this._animatingChange);
-
     // Reset bookmarks
     this._invalidateBookmarkContainers();
 

From 5f7283531f6f46903e154ac8baf5d57964dbc70c Mon Sep 17 00:00:00 2001
From: Jupi <73097618+JSGRD22@users.noreply.github.com>
Date: Thu, 13 Feb 2025 21:24:55 +0800
Subject: [PATCH 20/44] Set gfx.canvas.accelerated.cache-size to 256 by default

Signed-off-by: Jupi <73097618+JSGRD22@users.noreply.github.com>
---
 src/browser/app/profile/zen-browser.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index a61533e60..c13375eb1 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -425,7 +425,7 @@ pref("browser.aboutwelcome.enabled", false);
 
 // ---- Experimental settings to try make zen faster
 pref("gfx.canvas.accelerated.cache-items", 32768);
-pref("gfx.canvas.accelerated.cache-size", 4096);
+pref("gfx.canvas.accelerated.cache-size", 256);
 pref("gfx.content.skia-font-cache-size", 80);
 
 pref("media.memory_cache_max_size", 1048576);

From d6acd4deb8a0b62ced98d6522b4c6b428ca9f19a Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 13 Feb 2025 16:29:34 +0100
Subject: [PATCH 21/44] Fixed switching workspaces

---
 src/browser/base/content/ZenUIManager.mjs        |  2 +-
 .../base/content/zen-styles/zen-workspaces.css   |  1 +
 .../base/zen-components/ZenWorkspaces.mjs        | 13 +++++++++----
 .../tabbrowser/content/tabbrowser-js.patch       | 16 +++++++++++-----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index ca3354728..ca1aaecd3 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -414,7 +414,7 @@ var gZenVerticalTabsManager = {
       gBrowser.tabContainer.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
       gBrowser.tabContainer.arrowScrollbox.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
       // on purpose, we set the orient to horizontal, because the arrowScrollbox is vertical
-      gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute('orient', isVerticalTabs ? 'horizontal' : 'vertical');
+      gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute('orient', (isVerticalTabs && ZenWorkspaces.workspaceEnabled) ? 'horizontal' : 'vertical');
 
       const buttonsTarget = document.getElementById('zen-sidebar-top-buttons-customization-target');
       if (isRightSide) {
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index 32f2a7c9a..288032e8b 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -457,6 +457,7 @@
   max-height: var(--zen-workspace-indicator-height);
   min-height: var(--zen-workspace-indicator-height);
   gap: 12px;
+  white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
   flex-direction: row !important;
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 421f46a8a..65c0a824d 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1500,7 +1500,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
-  async _animateTabs(newWorkspace, shouldAnimate) {
+  async _animateTabs(newWorkspace, shouldAnimate, tabToSelect = null) {
     this._animatingChange = true;
     const animations = [];
     const workspaces = await this._workspaces();
@@ -1534,11 +1534,18 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
       if (offset === 0) {
         element.setAttribute('active', 'true');
+        if (tabToSelect) {
+          gBrowser.selectedTab = tabToSelect;
+          tabToSelect._visuallySelected = false;
+        }
       } else {
         element.removeAttribute('active');
       }
     }
     await Promise.all(animations);
+    if (tabToSelect) {
+      tabToSelect._visuallySelected = false;
+    }
     this._animatingChange = false;
   }
 
@@ -1618,7 +1625,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       tabToSelect = newTab;
     }
     tabToSelect._visuallySelected = true;
-    this._lastSelectedWorkspaceTabs[window.uuid] = tabToSelect;
 
     // Always make sure we always unselect the tab from the old workspace
     if (currentSelectedTab && currentSelectedTab !== tabToSelect) {
@@ -1641,8 +1647,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     gZenThemePicker.onWorkspaceChange(window);
 
-    await this._animateTabs(window, !onInit && !this._animatingChange);
-    gBrowser.selectedTab = tabToSelect;
+    await this._animateTabs(window, !onInit && !this._animatingChange, tabToSelect);
 
     // Notify listeners
     if (this._changeListeners?.length) {
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index e5ba04639..3863cf041 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6eeb57088 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbef2582976 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -57,8 +57,12 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6
        }
        aTab.setAttribute("pinned", "true");
        this._updateTabBarForPinnedTabs();
-@@ -831,7 +859,7 @@
-           this.tabContainer.arrowScrollbox.prepend(aTab);
+@@ -828,10 +856,10 @@
+           // the moving of a tab from the vertical pinned tabs container
+           // and back into arrowscrollbox.
+           aTab.removeAttribute("pinned");
+-          this.tabContainer.arrowScrollbox.prepend(aTab);
++          ZenWorkspaces.activeWorkspaceStrip.prepend(aTab);
          });
        } else {
 -        this.moveTabTo(aTab, this.pinnedTabCount - 1, {
@@ -112,11 +116,13 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..c90119b4b248887fd8612beb9aac83c6
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2447,7 +2484,7 @@
+@@ -2446,8 +2483,8 @@
+       // If we transitioned from one browser to two browsers, we need to set
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
-         this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
+-        this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
 -        this.tabs[1].linkedBrowser.browsingContext.hasSiblings = true;
++        if (this.tabs[0].linkedBrowser.browsingContext) this.tabs[0].linkedBrowser.browsingContext.hasSiblings = true;
 +        if (this.tabs[1].linkedBrowser.browsingContext) this.tabs[1].linkedBrowser.browsingContext.hasSiblings = true;
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;

From a5ae4077cfbc88b48ee0068d0a771bbc2968de98 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 17:32:33 +0100
Subject: [PATCH 22/44] Refactor workspace tab transformations and update tab
 selection logic

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 65c0a824d..01da4272b 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1544,7 +1544,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
     await Promise.all(animations);
     if (tabToSelect) {
-      tabToSelect._visuallySelected = false;
+      tabToSelect._visuallySelected = true;
     }
     this._animatingChange = false;
   }
@@ -1592,7 +1592,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
 
     // Show if tab belongs to current workspace
-    return true;
+    return tabWorkspaceId === workspaceUuid;
   }
 
   async _handleTabSelection(window, onInit, containerId, workspaces, previousWorkspaceId) {

From 31ef8d2ec935161d1e9e6db44c0eeac631e9b4cf Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 19:17:20 +0100
Subject: [PATCH 23/44] Refactor tab management and update CSS for improved
 layout and performance

---
 src/browser/base/content/ZenUIManager.mjs      |  7 +++++--
 .../content/navigator-toolbox-inc-xhtml.patch  | 14 ++++++++------
 .../zen-styles/zen-tabs/vertical-tabs.css      |  5 ++++-
 .../base/zen-components/ZenWorkspaces.mjs      | 18 ++++++++++--------
 4 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index ca1aaecd3..a20dafdef 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -35,7 +35,7 @@ var gZenUIManager = {
 
   updateTabsToolbar() {
     // Set tabs max-height to the "toolbar-items" height
-    const tabs = document.getElementById('zen-browser-tabs-wrapper');
+    const tabs = this.tabsWrapper;
     // Remove tabs so we can accurately calculate the height
     // without them affecting the height of the toolbar
     for (const tab of gBrowser.tabs) {
@@ -414,7 +414,10 @@ var gZenVerticalTabsManager = {
       gBrowser.tabContainer.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
       gBrowser.tabContainer.arrowScrollbox.setAttribute('orient', isVerticalTabs ? 'vertical' : 'horizontal');
       // on purpose, we set the orient to horizontal, because the arrowScrollbox is vertical
-      gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute('orient', (isVerticalTabs && ZenWorkspaces.workspaceEnabled) ? 'horizontal' : 'vertical');
+      gBrowser.tabContainer.arrowScrollbox.scrollbox.setAttribute(
+        'orient',
+        isVerticalTabs && ZenWorkspaces.workspaceEnabled ? 'horizontal' : 'vertical'
+      );
 
       const buttonsTarget = document.getElementById('zen-sidebar-top-buttons-customization-target');
       if (isRightSide) {
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index bc2ef52de..0419daa0c 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index a0a382643a2f74b6d789f3641ef300eed202d5e9..340475da315e67b2dd4f93567547cde703a90ee8 100644
+index a0a382643a2f74b6d789f3641ef300eed202d5e9..fd60aceee18e22d40c7d86506408803e3f4ffd45 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -40,17 +40,18 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..340475da315e67b2dd4f93567547cde7
          <tabs id="tabbrowser-tabs"
                is="tabbrowser-tabs"
                aria-multiselectable="true"
-@@ -50,6 +50,9 @@
+@@ -50,6 +50,10 @@
                tooltip="tabbrowser-tab-tooltip"
                orient="horizontal"
                stopwatchid="FX_TAB_CLICK_MS">
 +<html:div id="zen-essentials-container" skipintoolbarset="true"></html:div>
 +<hbox id="zen-current-workspace-indicator-container"></hbox>
 +<html:div id="zen-browser-tabs-wrapper">
++<html:div id="zen-browser-tabs-container">
            <hbox class="tab-drop-indicator" hidden="true"/>
  # If the name (tabbrowser-arrowscrollbox) or structure of this changes
  # significantly, there is an optimization in
-@@ -57,7 +60,7 @@
+@@ -57,7 +61,7 @@
  # the current structure that we may want to revisit.
            <html:div id="vertical-pinned-tabs-container" tabindex="-1"></html:div>
            <html:div id="vertical-pinned-tabs-container-separator"></html:div>
@@ -59,15 +60,16 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..340475da315e67b2dd4f93567547cde7
              <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
              <hbox id="tabbrowser-arrowscrollbox-periphery">
                <toolbartabstop/>
-@@ -75,6 +78,7 @@
+@@ -75,6 +79,8 @@
                                tooltip="dynamic-shortcut-tooltip"
                                data-l10n-id="tabs-toolbar-new-tab"/>
            <html:span id="tabbrowser-tab-a11y-desc" hidden="true"/>
++</html:div>
 +</html:div>
          </tabs>
  
          <toolbarbutton id="new-tab-button"
-@@ -100,11 +104,12 @@
+@@ -100,11 +106,12 @@
  #include private-browsing-indicator.inc.xhtml
      <toolbarbutton id="content-analysis-indicator"
                     class="toolbarbutton-1 content-analysis-indicator-icon"/>
@@ -83,7 +85,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..340475da315e67b2dd4f93567547cde7
    <toolbar id="nav-bar"
             class="browser-toolbar chromeclass-location"
             data-l10n-id="navbar-accessible"
-@@ -490,10 +495,12 @@
+@@ -490,10 +497,12 @@
                       consumeanchor="PanelUI-button"
                       data-l10n-id="appmenu-menu-button-closed2"/>
      </toolbaritem>
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index a5ca41b3f..5efc7354f 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -368,9 +368,12 @@
 #zen-browser-tabs-wrapper {
   min-height: fit-content;
   overflow-y: auto;
-  overflow-x: clip !important; /* might break custom css with new design, so let's force it */
   height: 100%;
   scrollbar-width: thin;
+}
+
+#zen-browser-tabs-container {
+  overflow-x: clip !important; /* might break custom css with new design, so let's force it */
   position: relative;
 }
 
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 01da4272b..e622626b8 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1464,13 +1464,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       for (const container of document.querySelectorAll(selector)) {
         container.style.transform = `translateX(${newTransform + offsetPixels / 2}%)`;
         container.style.opacity = offsetPixels ? 1 : !newTransform;
-      }
-      if (!justMove) {
-        const pinnedContainerId = '#vertical-pinned-tabs-container ';
-        const arrowScrollboxId = '#tabbrowser-arrowscrollbox ';
-        const pinnedContainer = document.querySelector(pinnedContainerId + selector);
-        const arrowScrollbox = document.querySelector(arrowScrollboxId + selector);
-        this._updateMarginTopPinnedTabs(arrowScrollbox, pinnedContainer);
+        if (!offsetPixels && !container.hasAttribute('active')) {
+          container.style.position = 'fixed';
+        } else {
+          container.style.removeProperty('position');
+        }
       }
     }
   }
@@ -1513,6 +1511,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const newTransform = `translateX(${offset}%)`;
       const isCurrent = offset === 0;
       if (shouldAnimate) {
+        element.style.removeProperty('position');
         if (isCurrent) {
           element.style.opacity = 1;
         }
@@ -1534,7 +1533,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
       if (offset === 0) {
         element.setAttribute('active', 'true');
-        if (tabToSelect) {
+        if (tabToSelect != gBrowser.selectedTab) {
           gBrowser.selectedTab = tabToSelect;
           tabToSelect._visuallySelected = false;
         }
@@ -1647,7 +1646,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     gZenThemePicker.onWorkspaceChange(window);
 
+    document.getElementById('zen-browser-tabs-wrapper').style.scrollbarWidth = 'none';
     await this._animateTabs(window, !onInit && !this._animatingChange, tabToSelect);
+    await this._organizeWorkspaceStripLocations(window, true);
+    document.getElementById('zen-browser-tabs-wrapper').style.scrollbarWidth = '';
 
     // Notify listeners
     if (this._changeListeners?.length) {

From 855c36280ba34c34b97fbabef6f1af1fc8f527ff Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 19:36:00 +0100
Subject: [PATCH 24/44] Refactor tab overflow detection and adjust workspace
 initialization logic

---
 src/browser/base/content/ZenStartup.mjs           | 4 ++--
 src/browser/base/zen-components/ZenWorkspaces.mjs | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index a09e51f47..e25539c50 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -94,8 +94,8 @@
       // Detect overflow and underflow
       const observer = new ResizeObserver((_) => {
         const tabContainer = gBrowser.tabContainer;
-        const isVertical = tabContainer.getAttribute('orient') === 'vertical';
-        let contentSize = tabsWrapper.getBoundingClientRect()[isVertical ? 'height' : 'width'];
+        // const isVertical = tabContainer.getAttribute('orient') === 'vertical';
+        // let contentSize = tabsWrapper.getBoundingClientRect()[isVertical ? 'height' : 'width'];
         // NOTE: This should be contentSize > scrollClientSize, but due
         // to how Gecko internally rounds in those cases, we allow for some
         // minor differences (the internal Gecko layout size is 1/60th of a
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index e622626b8..072f7494b 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -526,7 +526,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
           this.activeWorkspace = activeWorkspace?.uuid;
         }
       }
-      await this.initializeTabsStripSections();
       try {
         if (activeWorkspace) {
           window.gZenThemePicker = new ZenThemePicker();
@@ -535,6 +534,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       } catch (e) {
         console.error('ZenWorkspaces: Error initializing theme picker', e);
       }
+      await this.initializeTabsStripSections();
     }
   }
 

From 48879fb6a087060ffa879c6a0960161f519cf9bc Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 21:15:55 +0100
Subject: [PATCH 25/44] Enhance workspace tab initialization and update tab
 toolbar on load

---
 src/browser/base/content/ZenUIManager.mjs         | 1 +
 src/browser/base/zen-components/ZenWorkspaces.mjs | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index a20dafdef..c4cb657e7 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -27,6 +27,7 @@ var gZenUIManager = {
 
     SessionStore.promiseAllWindowsRestored.then(() => {
       this._hasLoadedDOM = true;
+      this.updateTabsToolbar();
     });
 
     window.addEventListener('TabClose', this.onTabClose.bind(this));
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 072f7494b..ec56db764 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -148,7 +148,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   async initializeTabsStripSections() {
     const perifery = document.getElementById('tabbrowser-arrowscrollbox-periphery');
     const tabs = gBrowser.tabContainer.allTabs.filter((tab) => !tab.pinned);
-    for (const workspace of (await this._workspaces()).workspaces) {
+    const workspaces = await this._workspaces();
+    for (const workspace of workspaces.workspaces) {
       this._createWorkspaceTabsSection(workspace, tabs, perifery);
     }
     if (tabs.length) {
@@ -164,6 +165,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     perifery.setAttribute('hidden', 'true');
     this._hasInitializedTabsStrip = true;
     this.registerPinnedResizeObserver();
+    this._fixIndicatorsNames(workspaces);
   }
 
   _createWorkspaceSection(workspace) {
@@ -526,6 +528,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
           this.activeWorkspace = activeWorkspace?.uuid;
         }
       }
+      await this.initializeTabsStripSections();
       try {
         if (activeWorkspace) {
           window.gZenThemePicker = new ZenThemePicker();
@@ -534,7 +537,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       } catch (e) {
         console.error('ZenWorkspaces: Error initializing theme picker', e);
       }
-      await this.initializeTabsStripSections();
     }
   }
 
@@ -1740,7 +1742,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   onPinnedTabsResize(entries) {
-    if (!this.workspaceEnabled) {
+    if (!this.workspaceEnabled || !this._hasInitializedTabsStrip) {
       return;
     }
     for (const entry of entries) {

From 07ede1b96bd6895cd4960978a5ba3a54cb68e9fa Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 13 Feb 2025 22:02:17 +0100
Subject: [PATCH 26/44] Add Windows acrylic support and enhance toolbar
 transparency styles

---
 src/browser/app/profile/zen-browser.js            |  4 ++++
 src/browser/base/content/zen-styles/zen-theme.css | 10 +++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js
index a61533e60..bbc3d7069 100644
--- a/src/browser/app/profile/zen-browser.js
+++ b/src/browser/app/profile/zen-browser.js
@@ -127,6 +127,10 @@ pref('zen.view.experimental-rounded-view', false);
 pref('zen.view.experimental-rounded-view', true);
 #endif
 
+#ifdef XP_WIN
+pref('zen.widget.windows.acrylic', true);
+#endif
+
 // Glance
 pref('zen.glance.enabled', true);
 pref('zen.glance.hold-duration', 300); // in ms
diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index 480f65c52..f5482f7ac 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -162,9 +162,13 @@
   @media (-moz-windows-mica) or (-moz-platform: macos) {
     background: transparent;
     --zen-themed-toolbar-bg-transparency: 0;
-    --zen-themed-toolbar-bg-transparent: light-dark(
-      rgba(255, 255, 255, var(--zen-themed-toolbar-bg-transparency)),
-      rgba(0, 0, 0, var(--zen-themed-toolbar-bg-transparency))
+    @media (-moz-bool-pref: 'zen.widget.windows.acrylic') {
+      --zen-themed-toolbar-bg-transparency: 15%;
+    }
+    --zen-themed-toolbar-bg-transparent: color-mix(
+      in srgb,
+      var(--zen-themed-toolbar-bg) calc(100% - var(--zen-themed-toolbar-bg-transparency)),
+      transparent var(--zen-themed-toolbar-bg-transparency)
     );
   }
 

From 869c2eb8b295924bd1d2cdae82f6135c5d5c4052 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 11:29:25 +0100
Subject: [PATCH 27/44] Refactor pinned tab management and improve event
 handling for workspace initialization

---
 src/browser/base/content/ZenUIManager.mjs     |  4 +-
 .../zen-components/ZenPinnedTabManager.mjs    | 53 +++-------------
 .../zen-components/ZenPinnedTabsStorage.mjs   |  1 -
 .../base/zen-components/ZenWorkspaces.mjs     | 61 +++++++++++++------
 .../sessionstore/SessionStore-sys-mjs.patch   | 18 +++++-
 .../tabbrowser/content/tabbrowser-js.patch    | 27 +++++---
 .../tabbrowser/content/tabs-js.patch          | 26 +++++---
 7 files changed, 102 insertions(+), 88 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index c4cb657e7..9e83c5a32 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -241,9 +241,7 @@ var gZenVerticalTabsManager = {
     window.addEventListener('customizationstarting', this._preCustomize.bind(this));
     window.addEventListener('aftercustomization', this._postCustomize.bind(this));
 
-    window.addEventListener('DOMContentLoaded', updateEvent, { once: true });
-
-    const tabs = document.getElementById('tabbrowser-tabs');
+    window.addEventListener('MozAfterPaint', updateEvent, { once: true });
 
     if (!this.isWindowsStyledButtons) {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index a3487fee7..a046f472a 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -69,7 +69,9 @@
         return;
       }
 
-      await this._refreshPinnedTabs(newWorkspace, { init: onInit });
+      if (onInit) {
+        await this._refreshPinnedTabs(newWorkspace, { init: onInit });
+      }
     }
 
     log(message) {
@@ -152,7 +154,7 @@
       const pinsToCreate = new Set(pins.map((p) => p.uuid));
 
       // First pass: identify existing tabs and remove those without pins
-      for (let tab of gBrowser.tabs) {
+      for (let tab of ZenWorkspaces.allStoredTabs) {
         const pinId = tab.getAttribute('zen-pin-id');
         if (!pinId) {
           continue;
@@ -178,10 +180,6 @@
           continue; // Skip pins that already have tabs
         }
 
-        if (!this._shouldShowPin(pin, currentWorkspace, workspaces)) {
-          continue; // Skip pins not relevant to current workspace
-        }
-
         let params = {
           skipAnimation: true,
           allowInheritPrincipal: false,
@@ -234,6 +232,12 @@
 
         this.log(`Created new pinned tab for pin ${pin.uuid} (isEssential: ${pin.isEssential})`);
         gBrowser.pinTab(newTab);
+        if (!pin.isEssential) {
+          const contaienr = document.querySelector(
+            `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${pin.workspaceUuid}"]`
+          );
+          contaienr.insertBefore(newTab, contaienr.lastChild);
+        }
 
         newTab.initialize();
       }
@@ -246,43 +250,6 @@
       gBrowser._updateTabBarForPinnedTabs();
     }
 
-    _shouldShowPin(pin, currentWorkspace, workspaces) {
-      const isEssential = pin.isEssential;
-      const pinWorkspaceUuid = pin.workspaceUuid;
-      const pinContextId = pin.containerTabId ? pin.containerTabId.toString() : '0';
-      const workspaceContextId = currentWorkspace.containerTabId?.toString() || '0';
-      const containerSpecificEssentials = ZenWorkspaces.containerSpecificEssentials;
-
-      // Handle essential pins
-      if (isEssential) {
-        if (!containerSpecificEssentials) {
-          return true; // Show all essential pins when containerSpecificEssentials is false
-        }
-
-        if (workspaceContextId !== '0') {
-          // In workspaces with default container: Show essentials that match the container
-          return pinContextId === workspaceContextId;
-        } else {
-          // In workspaces without a default container: Show essentials that aren't in container-specific workspaces
-          // or have userContextId="0" or no userContextId
-          return (
-            !pinContextId ||
-            pinContextId === '0' ||
-            !workspaces.workspaces.some((workspace) => workspace.containerTabId === parseInt(pinContextId, 10))
-          );
-        }
-      }
-
-      // For non-essential pins
-      if (!pinWorkspaceUuid) {
-        // Pins without a workspace belong to all workspaces (if that's your desired behavior)
-        return true;
-      }
-
-      // Show if pin belongs to current workspace
-      return pinWorkspaceUuid === currentWorkspace.uuid;
-    }
-
     _onPinnedTabEvent(action, event) {
       if (!this.enabled) return;
       const tab = event.target;
diff --git a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
index 7e5ab6017..b47850b4e 100644
--- a/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabsStorage.mjs
@@ -46,7 +46,6 @@ var ZenPinnedTabsStorage = {
         CREATE INDEX IF NOT EXISTS idx_zen_pins_changes_uuid ON zen_pins_changes(uuid)
       `);
 
-      await SessionStore.promiseInitialized;
       this._resolveInitialized();
     });
   },
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index ec56db764..bd698f616 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -28,13 +28,17 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._resolvePinnedInitialized = resolve;
   });
 
+  promiseSectionsInitialized = new Promise((resolve) => {
+    this._resolveSectionsInitialized = resolve;
+  });
+
   workspaceIndicatorXUL = `
     <hbox class="zen-current-workspace-indicator-icon"></hbox>
     <hbox class="zen-current-workspace-indicator-name"></hbox>
   `;
 
   async waitForPromises() {
-    await Promise.all([this.promiseDBInitialized, this.promisePinnedInitialized, SessionStore.promiseAllWindowsRestored]);
+    await Promise.all([this.promiseDBInitialized, this.promisePinnedInitialized]);
   }
 
   async init() {
@@ -75,18 +79,21 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     );
     ChromeUtils.defineLazyGetter(this, 'tabContainer', () => document.getElementById('tabbrowser-tabs'));
     this._activeWorkspace = Services.prefs.getStringPref('zen.workspaces.active', '');
-    this._delayedStartup();
+    await SessionStore.promiseInitialized;
+    if (!this._hasInitializedTabsStrip) {
+      await this.delayedStartup();
+    }
+    await this.promiseSectionsInitialized;
+    window.addEventListener('MozAfterPaint', async () => {
+      await SessionStore.promiseAllWindowsRestored;
+      await this.afterLoadInit();
+    }, { once: true });
   }
 
-  async _delayedStartup() {
-    if (!this.workspaceEnabled) {
-      return;
-    }
-    this._pinnedTabsResizeObserver = new ResizeObserver(this.onPinnedTabsResize.bind(this));
-    await this.waitForPromises();
-    await this.initializeWorkspaces();
+  async afterLoadInit() {
     console.info('ZenWorkspaces: ZenWorkspaces initialized');
 
+    await this.initializeWorkspaces();
     if (Services.prefs.getBoolPref('zen.workspaces.swipe-actions', false) && this.workspaceEnabled) {
       this.initializeGestureHandlers();
       this.initializeWorkspaceNavigation();
@@ -103,6 +110,16 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     );
   }
 
+  async delayedStartup() {
+    if (!this.workspaceEnabled) {
+      return;
+    }
+    this._pinnedTabsResizeObserver = new ResizeObserver(this.onPinnedTabsResize.bind(this));
+    await this.waitForPromises();
+    await this.initializeTabsStripSections();
+    this._resolveSectionsInitialized();
+  }
+
   registerPinnedResizeObserver() {
     if (!this._hasInitializedTabsStrip) {
       return;
@@ -117,7 +134,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   get activeWorkspaceStrip() {
-    if (!this.workspaceEnabled || !this._hasInitializedTabsStrip) {
+    if (!this._hasInitializedTabsStrip) {
       return gBrowser.tabContainer.arrowScrollbox;
     }
     const activeWorkspace = this.activeWorkspace;
@@ -147,7 +164,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   async initializeTabsStripSections() {
     const perifery = document.getElementById('tabbrowser-arrowscrollbox-periphery');
-    const tabs = gBrowser.tabContainer.allTabs.filter((tab) => !tab.pinned);
+    const tabs = gBrowser.tabContainer.allTabs;
     const workspaces = await this._workspaces();
     for (const workspace of workspaces.workspaces) {
       this._createWorkspaceTabsSection(workspace, tabs, perifery);
@@ -156,11 +173,17 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const defaultSelectedContainer = document.querySelector(
         `#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
       );
+      const pinnedContainer = document.querySelector(
+        `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
+      );
       for (const tab of tabs) {
+        if (tab.pinned) {
+          pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
+          continue;
+        }
         // before to the last child (perifery)
         defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
       }
-      this.tabContainer._invalidateCachedTabs();
     }
     perifery.setAttribute('hidden', 'true');
     this._hasInitializedTabsStrip = true;
@@ -210,7 +233,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         section.appendChild(tab);
       }
     }
-    this.tabContainer._invalidateCachedTabs();
   }
 
   initializeWorkspaceNavigation() {
@@ -512,7 +534,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       await this.workspaceBookmarks();
       window.addEventListener('TabBrowserInserted', this.onTabBrowserInserted.bind(this));
       window.addEventListener('TabOpen', this.updateTabsContainers.bind(this));
-      window.addEventListener('TabClose', this.updateTabsContainers.bind(this));
       let workspaces = await this._workspaces();
       let activeWorkspace = null;
       if (workspaces.workspaces.length === 0) {
@@ -528,11 +549,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
           this.activeWorkspace = activeWorkspace?.uuid;
         }
       }
-      await this.initializeTabsStripSections();
       try {
         if (activeWorkspace) {
           window.gZenThemePicker = new ZenThemePicker();
           await this.changeWorkspace(activeWorkspace, { onInit: true });
+          gBrowser.tabContainer._positionPinnedTabs();
         }
       } catch (e) {
         console.error('ZenWorkspaces: Error initializing theme picker', e);
@@ -1335,8 +1356,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     let tab = gZenUIManager.openAndChangeToTab(BROWSER_NEW_TAB_URL);
 
     if (window.uuid) {
-      this.moveTabToWorkspace(tab, window.uuid);
+      tab.setAttribute("zen-workspace-id", window.uuid)
     }
+
+    return tab;
   }
 
   async saveWorkspaceFromCreate() {
@@ -1401,8 +1424,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (!this.workspaceEnabled || this._inChangingWorkspace) {
       return;
     }
-
-    await SessionStore.promiseInitialized;
     this._inChangingWorkspace = true;
     try {
       await this._performWorkspaceChange(window, ...args);
@@ -1742,7 +1763,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   onPinnedTabsResize(entries) {
-    if (!this.workspaceEnabled || !this._hasInitializedTabsStrip) {
+    if (!this._hasInitializedTabsStrip) {
       return;
     }
     for (const entry of entries) {
@@ -1790,7 +1811,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       }
 
       // Switch workspace if needed
-      if (workspaceID && workspaceID !== activeWorkspace.uuid) {
+      if (workspaceID && workspaceID !== activeWorkspace.uuid && parent.ZenWorkspaces._hasInitializedTabsStrip) {
         await parent.ZenWorkspaces.changeWorkspace({ uuid: workspaceID });
       }
     }
diff --git a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
index 2c7b2688f..c00a2b8e4 100644
--- a/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
+++ b/src/browser/components/sessionstore/SessionStore-sys-mjs.patch
@@ -1,8 +1,20 @@
 diff --git a/browser/components/sessionstore/SessionStore.sys.mjs b/browser/components/sessionstore/SessionStore.sys.mjs
-index 908743177d9f95e2e6549c689e7a493ca8668701..b452d7dfc93f6171f8a65668e052a37638f1f6c3 100644
+index 908743177d9f95e2e6549c689e7a493ca8668701..2dd53f5fdbffb21dfdc8bf68a6771d4ac0acd8be 100644
 --- a/browser/components/sessionstore/SessionStore.sys.mjs
 +++ b/browser/components/sessionstore/SessionStore.sys.mjs
-@@ -3848,6 +3848,7 @@ var SessionStoreInternal = {
+@@ -2174,9 +2174,10 @@ var SessionStoreInternal = {
+           TelemetryStopwatch.finish(
+             "FX_SESSION_RESTORE_STARTUP_ONLOAD_INITIAL_WINDOW_MS"
+           );
+-
++          aWindow.ZenWorkspaces.delayedStartup().then(() => {
+           // Let everyone know we're done.
+           this._deferredInitialized.resolve();
++          });
+         }
+       })
+       .catch(ex => {
+@@ -3848,6 +3849,7 @@ var SessionStoreInternal = {
          aWindow.gBrowser.selectedTab = newTab;
        }
  
@@ -10,7 +22,7 @@ index 908743177d9f95e2e6549c689e7a493ca8668701..b452d7dfc93f6171f8a65668e052a376
        // Restore the state into the new tab.
        this.restoreTab(newTab, tabState, {
          restoreImmediately: aRestoreImmediately,
-@@ -5315,7 +5316,7 @@ var SessionStoreInternal = {
+@@ -5315,7 +5317,7 @@ var SessionStoreInternal = {
      }
  
      let tabbrowser = aWindow.gBrowser;
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 3863cf041..5511152c7 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbef2582976 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5e12e95a1 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -321,7 +321,16 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -5465,10 +5558,10 @@
+@@ -4812,6 +4905,8 @@
+         this.tabs[i]._tPos = i;
+       }
+ 
++      ZenWorkspaces.updateTabsContainers();
++
+       if (!this._windowIsClosing) {
+         if (wasPinned) {
+           this.tabContainer._positionPinnedTabs();
+@@ -5465,10 +5560,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -334,7 +343,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5706,9 +5799,9 @@
+@@ -5706,9 +5801,9 @@
  
        // Don't allow mixing pinned and unpinned tabs.
        if (aTab.pinned) {
@@ -346,7 +355,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
        }
        if (aTab._tPos == aIndex) {
          return;
-@@ -5727,6 +5820,9 @@
+@@ -5727,6 +5822,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -356,7 +365,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -5802,7 +5898,7 @@
+@@ -5802,7 +5900,7 @@
          createLazyBrowser,
        };
  
@@ -365,7 +374,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
        if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
          params.pinned = true;
        }
-@@ -7443,6 +7539,7 @@
+@@ -7443,6 +7541,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -373,7 +382,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8508,7 @@ var TabContextMenu = {
+@@ -8411,7 +8510,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -382,7 +391,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8541,7 @@ var TabContextMenu = {
+@@ -8444,7 +8543,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -391,7 +400,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..364bd46b5244c13139dec5a7f9401dbe
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8774,7 @@ var TabContextMenu = {
+@@ -8677,6 +8776,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index dfafb0b6c..acadf284f 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b20e112db 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..0bbce48745d85188ffc0ed9758ee4978bb3c8e59 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -293,7 +293,15 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
        let absPositionHorizontalTabs =
          this.overflowing && tabs.length > numPinned && numPinned > 0;
  
-@@ -2074,7 +2099,7 @@
+@@ -2003,6 +2028,7 @@
+       if (this.verticalMode) {
+         this._updateVerticalPinnedTabs();
+       } else if (absPositionHorizontalTabs) {
++        return;
+         let layoutData = this._pinnedTabsLayoutCache;
+         let uiDensity = document.documentElement.getAttribute("uidensity");
+         if (!layoutData || layoutData.uiDensity != uiDensity) {
+@@ -2074,7 +2100,7 @@
          return;
        }
  
@@ -302,7 +310,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
  
        let directionX = screenX > dragData.animLastScreenX;
        let directionY = screenY > dragData.animLastScreenY;
-@@ -2257,9 +2282,9 @@
+@@ -2257,9 +2283,9 @@
        }
  
        let pinned = draggedTab.pinned;
@@ -315,7 +323,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
          pinned ? numPinned : undefined
        );
  
-@@ -2502,8 +2527,9 @@
+@@ -2502,8 +2528,9 @@
        );
      }
  
@@ -327,7 +335,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
          return;
        }
  
-@@ -2668,9 +2694,9 @@
+@@ -2668,9 +2695,9 @@
        function newIndex(aTab, index) {
          // Don't allow mixing pinned and unpinned tabs.
          if (aTab.pinned) {
@@ -339,7 +347,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
        }
      }
  
-@@ -2754,7 +2780,7 @@
+@@ -2754,7 +2781,7 @@
      }
  
      _notifyBackgroundTab(aTab) {
@@ -348,7 +356,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
          return;
        }
  
-@@ -2772,12 +2798,14 @@
+@@ -2772,12 +2799,14 @@
                selectedTab = {
                  left: selectedTab.left,
                  right: selectedTab.right,
@@ -364,7 +372,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
                selectedTab,
              ];
            })
-@@ -2794,8 +2822,11 @@
+@@ -2794,8 +2823,11 @@
              delete this._lastTabToScrollIntoView;
              // Is the new tab already completely visible?
              if (
@@ -378,7 +386,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..f7866af6f5b72e2704a87148300a391b
              ) {
                return;
              }
-@@ -2803,21 +2834,29 @@
+@@ -2803,21 +2835,29 @@
              if (this.arrowScrollbox.smoothScroll) {
                // Can we make both the new tab and the selected tab completely visible?
                if (

From 46ff0020bb74e4cb7f40f0a5a0549b5ccf89afc7 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 11:32:40 +0100
Subject: [PATCH 28/44] Format event listener and improve attribute setting for
 workspace tabs

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index bd698f616..4a0cbfea6 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -84,10 +84,14 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       await this.delayedStartup();
     }
     await this.promiseSectionsInitialized;
-    window.addEventListener('MozAfterPaint', async () => {
-      await SessionStore.promiseAllWindowsRestored;
-      await this.afterLoadInit();
-    }, { once: true });
+    window.addEventListener(
+      'MozAfterPaint',
+      async () => {
+        await SessionStore.promiseAllWindowsRestored;
+        await this.afterLoadInit();
+      },
+      { once: true }
+    );
   }
 
   async afterLoadInit() {
@@ -1356,7 +1360,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     let tab = gZenUIManager.openAndChangeToTab(BROWSER_NEW_TAB_URL);
 
     if (window.uuid) {
-      tab.setAttribute("zen-workspace-id", window.uuid)
+      tab.setAttribute('zen-workspace-id', window.uuid);
     }
 
     return tab;

From c27a26eee4d1308b67bfaa080df1636267efc855 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 11:38:00 +0100
Subject: [PATCH 29/44] Rename 'zen-browser-tabs-wrapper' to 'zen-tabs-wrapper'
 across multiple files for consistency

---
 src/browser/base/content/ZenStartup.mjs                     | 2 +-
 src/browser/base/content/ZenUIManager.mjs                   | 2 +-
 src/browser/base/content/navigator-toolbox-inc-xhtml.patch  | 4 ++--
 src/browser/base/content/navigator-toolbox-js.patch         | 6 +++---
 .../base/content/zen-styles/zen-tabs/vertical-tabs.css      | 2 +-
 src/browser/base/zen-components/ZenPinnedTabManager.mjs     | 2 +-
 src/browser/base/zen-components/ZenWorkspaces.mjs           | 4 ++--
 src/browser/components/tabbrowser/content/tabs-js.patch     | 4 ++--
 8 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index e25539c50..c4dcd6817 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -85,7 +85,7 @@
     _initSidebarScrolling() {
       // Disable smooth scroll
       const canSmoothScroll = Services.prefs.getBoolPref('zen.startup.smooth-scroll-in-tabs', false);
-      const tabsWrapper = document.getElementById('zen-browser-tabs-wrapper');
+      const tabsWrapper = document.getElementById('zen-tabs-wrapper');
       gBrowser.tabContainer.addEventListener('wheel', (event) => {
         if (canSmoothScroll) return;
         event.preventDefault(); // Prevent the smooth scroll behavior
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 9e83c5a32..e9f32b5b7 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -63,7 +63,7 @@ var gZenUIManager = {
     if (this._tabsWrapper) {
       return this._tabsWrapper;
     }
-    this._tabsWrapper = document.getElementById('zen-browser-tabs-wrapper');
+    this._tabsWrapper = document.getElementById('zen-tabs-wrapper');
     return this._tabsWrapper;
   },
 
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index 0419daa0c..0f75a3ff5 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index a0a382643a2f74b6d789f3641ef300eed202d5e9..fd60aceee18e22d40c7d86506408803e3f4ffd45 100644
+index a0a382643a2f74b6d789f3641ef300eed202d5e9..7a2be5fe6cdecb771ce3326008085ae402a465de 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -2,7 +2,7 @@
@@ -46,7 +46,7 @@ index a0a382643a2f74b6d789f3641ef300eed202d5e9..fd60aceee18e22d40c7d86506408803e
                stopwatchid="FX_TAB_CLICK_MS">
 +<html:div id="zen-essentials-container" skipintoolbarset="true"></html:div>
 +<hbox id="zen-current-workspace-indicator-container"></hbox>
-+<html:div id="zen-browser-tabs-wrapper">
++<html:div id="zen-tabs-wrapper">
 +<html:div id="zen-browser-tabs-container">
            <hbox class="tab-drop-indicator" hidden="true"/>
  # If the name (tabbrowser-arrowscrollbox) or structure of this changes
diff --git a/src/browser/base/content/navigator-toolbox-js.patch b/src/browser/base/content/navigator-toolbox-js.patch
index 59e00cfd2..721a1e01b 100644
--- a/src/browser/base/content/navigator-toolbox-js.patch
+++ b/src/browser/base/content/navigator-toolbox-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.js b/browser/base/content/navigator-toolbox.js
-index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..3434a833c4d1220554b4df6eeeed83f500c6f812 100644
+index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..9e1e888554279b6e1df3bc1cb907afd2ccb330ca 100644
 --- a/browser/base/content/navigator-toolbox.js
 +++ b/browser/base/content/navigator-toolbox.js
 @@ -8,7 +8,7 @@
@@ -15,7 +15,7 @@ index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..3434a833c4d1220554b4df6eeeed83f5
          #reload-button ,
          #urlbar-go-button,
          #reader-mode-button,
-+        #zen-browser-tabs-wrapper,
++        #zen-tabs-wrapper,
          #picture-in-picture-button,
          #shopping-sidebar-button,
          #urlbar-zoom-button,
@@ -23,7 +23,7 @@ index 64ded8fb2c08f1dbfec8fe08ab427a24b53f1169..3434a833c4d1220554b4df6eeeed83f5
          case "vertical-tabs-newtab-button":
          case "tabs-newtab-button":
          case "new-tab-button":
-+        case "zen-browser-tabs-wrapper":
++        case "zen-tabs-wrapper":
            gBrowser.handleNewTabMiddleClick(element, event);
            break;
  
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 5efc7354f..286493476 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -365,7 +365,7 @@
   }
 }
 
-#zen-browser-tabs-wrapper {
+#zen-tabs-wrapper {
   min-height: fit-content;
   overflow-y: auto;
   height: 100%;
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index a046f472a..c81e6a670 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -642,7 +642,7 @@
         }
       }
       // Check for normal tabs container
-      else if (tabsTarget || event.target.id === 'zen-browser-tabs-wrapper') {
+      else if (tabsTarget || event.target.id === 'zen-tabs-wrapper') {
         if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
           gBrowser.unpinTab(draggedTab);
           moved = true;
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 4a0cbfea6..0991160cf 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1673,10 +1673,10 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
     gZenThemePicker.onWorkspaceChange(window);
 
-    document.getElementById('zen-browser-tabs-wrapper').style.scrollbarWidth = 'none';
+    document.getElementById('zen-tabs-wrapper').style.scrollbarWidth = 'none';
     await this._animateTabs(window, !onInit && !this._animatingChange, tabToSelect);
     await this._organizeWorkspaceStripLocations(window, true);
-    document.getElementById('zen-browser-tabs-wrapper').style.scrollbarWidth = '';
+    document.getElementById('zen-tabs-wrapper').style.scrollbarWidth = '';
 
     // Notify listeners
     if (this._changeListeners?.length) {
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index acadf284f..c4903a593 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..0bbce48745d85188ffc0ed9758ee4978bb3c8e59 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..2e8cacae772cca001fc7374ddd8281e0cb7f1f3f 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -16,7 +16,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..0bbce48745d85188ffc0ed9758ee4978
        if (
          event.button != 0 ||
 -        event.target != this.arrowScrollbox ||
-+        event.target != document.getElementById("zen-browser-tabs-wrapper") ||
++        event.target != document.getElementById("zen-tabs-wrapper") ||
          event.composedTarget.localName == "toolbarbutton"
        ) {
          return;

From 31f5762efddbe3976b670465026d306993491499 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 12:45:48 +0100
Subject: [PATCH 30/44] Improve active workspace selection logic in
 ZenWorkspaces

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 0991160cf..8e934159a 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -544,14 +544,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         activeWorkspace = await this.createAndSaveWorkspace('Default Workspace', true, '🏠');
       } else {
         activeWorkspace = await this.getActiveWorkspace();
-        if (!activeWorkspace) {
-          activeWorkspace = workspaces.workspaces.find((workspace) => workspace.default);
-          this.activeWorkspace = activeWorkspace?.uuid;
-        }
-        if (!activeWorkspace) {
-          activeWorkspace = workspaces.workspaces[0];
-          this.activeWorkspace = activeWorkspace?.uuid;
-        }
+        this.activeWorkspace = activeWorkspace?.uuid;
       }
       try {
         if (activeWorkspace) {
@@ -777,7 +770,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   async getActiveWorkspace() {
     const workspaces = await this._workspaces();
-    return workspaces.workspaces.find((workspace) => workspace.uuid === this.activeWorkspace) ?? workspaces.workspaces[0];
+    return workspaces.workspaces.find((workspace) => workspace.uuid === this.activeWorkspace) ??
+      workspaces.workspaces.find((workspace) => workspace.default) ?? workspaces.workspaces[0];
   }
   // Workspaces dialog UI management
 

From 5ace391a61b8b38dfdbd43e8dece0e9413bc02f2 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 16:52:46 +0100
Subject: [PATCH 31/44] Fixed common bugs with workspaces

---
 .../base/zen-components/ZenWorkspaces.mjs     | 57 +++++++++++++------
 .../tabbrowser/content/tabbrowser-js.patch    | 37 ++++--------
 .../tabbrowser/content/tabs-js.patch          |  6 +-
 3 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 8e934159a..8cc404986 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -177,16 +177,19 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const defaultSelectedContainer = document.querySelector(
         `#tabbrowser-arrowscrollbox .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
       );
-      const pinnedContainer = document.querySelector(
-        `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
-      );
-      for (const tab of tabs) {
-        if (tab.pinned) {
-          pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
-          continue;
+      // New profile with no workspaces does not have a default selected container
+      if (defaultSelectedContainer) {
+        const pinnedContainer = document.querySelector(
+          `#vertical-pinned-tabs-container .zen-workspace-tabs-section[zen-workspace-id="${this.activeWorkspace}"]`
+        );
+        for (const tab of tabs) {
+          if (tab.pinned) {
+            pinnedContainer.insertBefore(tab, pinnedContainer.lastChild);
+            continue;
+          }
+          // before to the last child (perifery)
+          defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
         }
-        // before to the last child (perifery)
-        defaultSelectedContainer.insertBefore(tab, defaultSelectedContainer.lastChild);
       }
     }
     perifery.setAttribute('hidden', 'true');
@@ -1556,16 +1559,12 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         element.setAttribute('active', 'true');
         if (tabToSelect != gBrowser.selectedTab) {
           gBrowser.selectedTab = tabToSelect;
-          tabToSelect._visuallySelected = false;
         }
       } else {
         element.removeAttribute('active');
       }
     }
     await Promise.all(animations);
-    if (tabToSelect) {
-      tabToSelect._visuallySelected = true;
-    }
     this._animatingChange = false;
   }
 
@@ -1644,7 +1643,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const newTab = this._createNewTabForWorkspace(window);
       tabToSelect = newTab;
     }
-    tabToSelect._visuallySelected = true;
+    if (tabToSelect) {
+      tabToSelect._visuallySelected = true;
+    }
 
     // Always make sure we always unselect the tab from the old workspace
     if (currentSelectedTab && currentSelectedTab !== tabToSelect) {
@@ -1720,7 +1721,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
   }
 
-  _createWorkspaceData(name, isDefault, icon) {
+  _createWorkspaceData(name, isDefault, icon, tabs) {
     let window = {
       uuid: gZenUIManager.generateUuidv4(),
       default: isDefault,
@@ -1731,7 +1732,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     this._prepareNewWorkspace(window);
     const perifery = document.querySelector('#tabbrowser-arrowscrollbox-periphery[hidden]');
     perifery?.removeAttribute('hidden');
-    this._createWorkspaceTabsSection(window, [], perifery);
+    this._createWorkspaceTabsSection(window, tabs, perifery);
     perifery.setAttribute('hidden', 'true');
     return window;
   }
@@ -1740,10 +1741,19 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (!this.workspaceEnabled) {
       return;
     }
-    let workspaceData = this._createWorkspaceData(name, isDefault, icon);
+    // get extra tabs remaning (e.g. on new profiles) and just move them to the new workspace
+    const extraTabs = Array.from(gBrowser.tabContainer.arrowScrollbox.children).filter(
+      (child) => child.tagName === 'tab' && !child.hasAttribute('zen-workspace-id')
+    );
+    let workspaceData = this._createWorkspaceData(name, isDefault, icon, extraTabs);
     await this.saveWorkspace(workspaceData);
-    await this.changeWorkspace(workspaceData);
     this.registerPinnedResizeObserver();
+    let changed = extraTabs.length > 0;
+    if (changed) {
+      gBrowser.tabContainer._invalidateCachedTabs();
+      gBrowser.selectedTab = extraTabs[0];
+    }
+    await this.changeWorkspace(workspaceData);
     return workspaceData;
   }
 
@@ -1816,12 +1826,21 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   }
 
   makeSurePinTabIsInCorrectPosition() {
+    if (!this.pinnedTabsContainer) {
+      return 0; // until we initialize the pinned tabs container
+    }
     const tabsInsidePinTab = Array.from(this.pinnedTabsContainer.parentElement.children).filter(
       (child) => child.tagName === 'tab'
     );
     let changed = false;
     for (const tab of tabsInsidePinTab) {
+      if (tab.getAttribute('zen-glance-tab') === 'true') {
+        continue;
+      }
       if (tab.getAttribute('zen-essential') === 'true') {
+        const container = document.getElementById('zen-essentials-container');
+        container.appendChild(tab);
+        changed = true;
         continue;
       }
       const workspaceId = tab.getAttribute('zen-workspace-id');
@@ -1837,6 +1856,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     if (changed) {
       gBrowser.tabContainer._invalidateCachedTabs();
     }
+    // Return the number of essentials INSIDE the pinned tabs container so we can correctly change their parent
+    return Array.from(this.pinnedTabsContainer.children).filter((child) => child.getAttribute('zen-essential') === 'true').length;
   }
 
   // Context menu management
diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 5511152c7..6790f1ba4 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5e12e95a1 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b62093051cc9a 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,39 @@
@@ -9,7 +9,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 +    get _numVisiblePinTabs() {
 +      let i = 0;
 +      for (let tab of this.tabs) {
-+        if (!tab.pinned) {
++        if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
 +          break;
 +        }
 +        if (!tab.hidden) {
@@ -22,7 +22,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 +    get _numZenEssentials() {
 +      let i = 0;
 +      for (let tab of this.tabs) {
-+        if (!tab.hasAttribute("zen-essential")) {
++        if (!tab.hasAttribute("zen-essential") && !tab.hasAttribute("zen-glance-tab")) {
 +          break;
 +        }
 +        if (!tab.hidden) {
@@ -37,14 +37,14 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 -        if (!this.tabs[i].pinned) {
 +      let i = 0;
 +      for (let tab of this.tabs) {
-+        if (!tab.pinned) {
++        if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
            break;
          }
 +        i++;
        }
        return i;
      }
-@@ -807,10 +835,10 @@
+@@ -807,7 +835,7 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
@@ -52,12 +52,8 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 +          aTab.hasAttribute("zen-essential") ? document.getElementById("zen-essentials-container").appendChild(aTab) : this.verticalPinnedTabsContainer.insertBefore(aTab, this.verticalPinnedTabsContainer.lastChild)
          );
        } else {
--        this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
-+        this.moveTabTo(aTab, this._numVisiblePinTabs, { forceStandaloneTab: true });
-       }
-       aTab.setAttribute("pinned", "true");
-       this._updateTabBarForPinnedTabs();
-@@ -828,10 +856,10 @@
+         this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
+@@ -828,7 +856,7 @@
            // the moving of a tab from the vertical pinned tabs container
            // and back into arrowscrollbox.
            aTab.removeAttribute("pinned");
@@ -65,11 +61,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
 +          ZenWorkspaces.activeWorkspaceStrip.prepend(aTab);
          });
        } else {
--        this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-+        this.moveTabTo(aTab, this._numVisiblePinTabs - 1, {
-           forceStandaloneTab: true,
-         });
-         aTab.removeAttribute("pinned");
+         this.moveTabTo(aTab, this.pinnedTabCount - 1, {
 @@ -1055,6 +1083,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
@@ -232,20 +224,11 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..bdebb5eeb16c1c7b9fd0d0266d5fa7b5
        if (typeof index != "number") {
          // Move the new tab after another tab if needed, to the end otherwise.
 -        index = Infinity;
-+        index = Services.prefs.getBoolPref("zen.view.show-newtab-button-top") ? this._numVisiblePinTabs : Infinity;
++        index = Services.prefs.getBoolPref("zen.view.show-newtab-button-top") ? this.pinnedTabCount : Infinity;
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3773,14 +3855,14 @@
-       // Ensure index is within bounds.
-       if (tab.pinned) {
-         index = Math.max(index, 0);
--        index = Math.min(index, this.pinnedTabCount);
-+        index = Math.min(index, this._numVisiblePinTabs);
-       } else {
--        index = Math.max(index, this.pinnedTabCount);
-+        index = Math.max(index, this._numVisiblePinTabs);
-         index = Math.min(index, this.tabs.length);
+@@ -3780,7 +3862,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index c4903a593..878c2193a 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..2e8cacae772cca001fc7374ddd8281e0cb7f1f3f 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..3d323615040dcb5e379519878fb7874d5b28de81 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -261,8 +261,8 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..2e8cacae772cca001fc7374ddd8281e0
  
 -      if (gBrowser.pinnedTabCount !== verticalTabsContainer.children.length) {
 -        let tabs = this.visibleTabs;
-+      ZenWorkspaces.makeSurePinTabIsInCorrectPosition();
-+      if (gBrowser.pinnedTabCount !== (verticalTabsContainer.children.length - 1 + document.getElementById("zen-essentials-container").children.length)) {
++      let count = ZenWorkspaces.makeSurePinTabIsInCorrectPosition();
++      if (gBrowser.pinnedTabCount !== (verticalTabsContainer.children.length - count - 1 + document.getElementById("zen-essentials-container").children.length)) {
 +        let tabs = this.allTabs.filter(tab => !tab.hasAttribute("zen-glance-tab"));
          for (let i = 0; i < numPinned; i++) {
            tabs[i].style.marginInlineStart = "";

From 12e2781668fab975c6b21be8d389b93058e00a2e Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 16:53:03 +0100
Subject: [PATCH 32/44] Format code for better readability in ZenWorkspaces

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 8cc404986..1518cb41b 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -773,8 +773,11 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
 
   async getActiveWorkspace() {
     const workspaces = await this._workspaces();
-    return workspaces.workspaces.find((workspace) => workspace.uuid === this.activeWorkspace) ??
-      workspaces.workspaces.find((workspace) => workspace.default) ?? workspaces.workspaces[0];
+    return (
+      workspaces.workspaces.find((workspace) => workspace.uuid === this.activeWorkspace) ??
+      workspaces.workspaces.find((workspace) => workspace.default) ??
+      workspaces.workspaces[0]
+    );
   }
   // Workspaces dialog UI management
 
@@ -1857,7 +1860,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       gBrowser.tabContainer._invalidateCachedTabs();
     }
     // Return the number of essentials INSIDE the pinned tabs container so we can correctly change their parent
-    return Array.from(this.pinnedTabsContainer.children).filter((child) => child.getAttribute('zen-essential') === 'true').length;
+    return Array.from(this.pinnedTabsContainer.children).filter((child) => child.getAttribute('zen-essential') === 'true')
+      .length;
   }
 
   // Context menu management

From 786a377ada2870194b6502e123e67ccb6a27a7a8 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 17:01:28 +0100
Subject: [PATCH 33/44] Invalidate cached tabs after inserting a new pinned tab
 in ZenPinnedTabManager

---
 src/browser/base/zen-components/ZenPinnedTabManager.mjs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index c81e6a670..0e6d0fee9 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -238,6 +238,7 @@
           );
           contaienr.insertBefore(newTab, contaienr.lastChild);
         }
+        gBrowser.tabContainer._invalidateCachedTabs();
 
         newTab.initialize();
       }

From 1a293fc5ff26eaf8b1eef5173dd5bbf838cef3d1 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 19:32:56 +0100
Subject: [PATCH 34/44] Refactor initialization logic in ZenStartup and update
 tab toolbar handling in ZenUIManager and ZenPinnedTabManager

---
 src/browser/base/content/ZenStartup.mjs                 | 8 +++-----
 src/browser/base/content/ZenUIManager.mjs               | 5 +++--
 src/browser/base/zen-components/ZenPinnedTabManager.mjs | 1 +
 src/browser/base/zen-components/ZenWorkspaces.mjs       | 3 +++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
index c4dcd6817..88e4fad4b 100644
--- a/src/browser/base/content/ZenStartup.mjs
+++ b/src/browser/base/content/ZenStartup.mjs
@@ -3,11 +3,9 @@
   var ZenStartup = {
     init() {
       this.openWatermark();
-      window.SessionStore.promiseInitialized.then(() => {
-        this._changeSidebarLocation();
-        this._zenInitBrowserLayout();
-        this._initSearchBar();
-      });
+      this._changeSidebarLocation();
+      this._zenInitBrowserLayout();
+      this._initSearchBar();
     },
 
     _zenInitBrowserLayout() {
diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index e9f32b5b7..42da71cc8 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -14,7 +14,7 @@ var gZenUIManager = {
       return ChromeUtils.importESModule('chrome://browser/content/zen-vendor/motion.min.mjs', { global: 'current' });
     });
 
-    new ResizeObserver(gZenCommonActions.throttle(this.updateTabsToolbar.bind(this), this.sidebarHeightThrottle)).observe(
+    new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(
       document.getElementById('TabsToolbar')
     );
 
@@ -241,7 +241,7 @@ var gZenVerticalTabsManager = {
     window.addEventListener('customizationstarting', this._preCustomize.bind(this));
     window.addEventListener('aftercustomization', this._postCustomize.bind(this));
 
-    window.addEventListener('MozAfterPaint', updateEvent, { once: true });
+    this._updateEvent();
 
     if (!this.isWindowsStyledButtons) {
       document.documentElement.setAttribute('zen-window-buttons-reversed', true);
@@ -570,6 +570,7 @@ var gZenVerticalTabsManager = {
     } catch (e) {
       console.error(e);
     }
+    gZenUIManager.updateTabsToolbar();
     this._isUpdating = false;
   },
 
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 0e6d0fee9..3bb7f747f 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -249,6 +249,7 @@
       }
 
       gBrowser._updateTabBarForPinnedTabs();
+      gZenUIManager.updateTabsToolbar();
     }
 
     _onPinnedTabEvent(action, event) {
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 1518cb41b..523f6e095 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -232,6 +232,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
   _organizeTabsToWorkspaceSections(workspace, section, pinnedSection, tabs) {
     const workspaceTabs = Array.from(tabs).filter((tab) => tab.getAttribute('zen-workspace-id') === workspace.uuid);
     for (const tab of workspaceTabs) {
+      if (tab.hasAttribute('zen-essential')) {
+        continue; // Ignore essentials as they need to be in their own section
+      }
       // remove tab from list
       tabs.splice(tabs.indexOf(tab), 1);
       if (tab.pinned) {

From bf91ffddf3d6ce1dbbace757762778e651d06604 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 19:42:48 +0100
Subject: [PATCH 35/44] Update visibility handling in ZenWorkspaces by
 replacing position styles with hidden attribute

---
 src/browser/base/zen-components/ZenWorkspaces.mjs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 523f6e095..7baabccac 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1495,9 +1495,9 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
         container.style.transform = `translateX(${newTransform + offsetPixels / 2}%)`;
         container.style.opacity = offsetPixels ? 1 : !newTransform;
         if (!offsetPixels && !container.hasAttribute('active')) {
-          container.style.position = 'fixed';
+          container.setAttribute('hidden', 'true');
         } else {
-          container.style.removeProperty('position');
+          container.removeAttribute('hidden');
         }
       }
     }
@@ -1541,7 +1541,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       const newTransform = `translateX(${offset}%)`;
       const isCurrent = offset === 0;
       if (shouldAnimate) {
-        element.style.removeProperty('position');
+        element.removeAttribute('hidden');
         if (isCurrent) {
           element.style.opacity = 1;
         }

From 47824d8bca4b15d45ef44a539b44bfc859dd3269 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 19:43:57 +0100
Subject: [PATCH 36/44] Simplify ResizeObserver initialization in ZenUIManager
 by consolidating method calls

---
 src/browser/base/content/ZenUIManager.mjs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 42da71cc8..dcc947dc1 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -14,9 +14,7 @@ var gZenUIManager = {
       return ChromeUtils.importESModule('chrome://browser/content/zen-vendor/motion.min.mjs', { global: 'current' });
     });
 
-    new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(
-      document.getElementById('TabsToolbar')
-    );
+    new ResizeObserver(this.updateTabsToolbar.bind(this)).observe(document.getElementById('TabsToolbar'));
 
     new ResizeObserver(
       gZenCommonActions.throttle(

From 8813c5174e2adfe4c1ca8827aa1da748f6e3d070 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 19:57:54 +0100
Subject: [PATCH 37/44] Update newtabButton to newtabButtons for multiple
 button handling in ZenUIManager

---
 src/browser/base/content/ZenUIManager.mjs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index dcc947dc1..3613dca34 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -147,8 +147,8 @@ var gZenUIManager = {
     this.__currentPopupTrackElement = null;
   },
 
-  get newtabButton() {
-    return ZenWorkspaces.activeWorkspaceStrip.querySelector('#tabs-newtab-button');
+  get newtabButtons() {
+    return document.querySelectorAll('#tabs-newtab-button');
   },
 
   _prevUrlbarLabel: null,
@@ -168,7 +168,9 @@ var gZenUIManager = {
       this._prevUrlbarLabel = gURLBar._untrimmedValue;
       gURLBar._zenHandleUrlbarClose = this.handleUrlbarClose.bind(this);
       gURLBar.setAttribute('zen-newtab', true);
-      this.newtabButton.setAttribute('in-urlbar', true);
+      for (const button of this.newtabButtons) {
+        button.setAttribute('in-urlbar', true);
+      }
       document.getElementById('Browser:OpenLocation').doCommand();
       gURLBar.search(this._lastSearch);
       return true;
@@ -186,7 +188,9 @@ var gZenUIManager = {
     gURLBar.removeAttribute('zen-newtab');
     this._lastTab._visuallySelected = true;
     this._lastTab = null;
-    this.newtabButton.removeAttribute('in-urlbar');
+    for (const button of this.newtabButtons) {
+      button.removeAttribute('in-urlbar');
+    }
     if (onSwitch) {
       this.clearUrlbarData();
     } else {

From 7a6398db45a75f40225eb3eb009e3642b21ab4fb Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Fri, 14 Feb 2025 23:57:10 +0100
Subject: [PATCH 38/44] Update MOZ_APP_DISPLAYNAME to use a consistent branding
 name in mozconfig

---
 configs/common/mozconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index f840e768c..fce7a4692 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -9,7 +9,7 @@ ac_add_options --with-l10n-base="${topsrcdir}/browser/locales"
 export MOZ_USER_DIR="${name}"
 export MOZ_APP_BASENAME=Zen
 export MOZ_APP_PROFILE=${binName}
-export MOZ_APP_DISPLAYNAME="${name}"
+export MOZ_APP_DISPLAYNAME="Zen"
 export MOZ_BRANDING_DIRECTORY=${brandingDir}
 export MOZ_OFFICIAL_BRANDING_DIRECTORY=${brandingDir}
 

From 697db429f60f192c12e7277051794e7a90ca0d7b Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 00:45:07 +0100
Subject: [PATCH 39/44] Refactor zen-theme.css to improve toolbar background
 transparency handling

---
 .../base/content/zen-styles/zen-theme.css     |   9 +-
 .../zen-components/ZenPinnedTabManager.mjs    | 112 +++++++++---------
 .../tabbrowser/content/tabs-js.patch          |   4 +-
 3 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-theme.css b/src/browser/base/content/zen-styles/zen-theme.css
index f5482f7ac..72955e154 100644
--- a/src/browser/base/content/zen-styles/zen-theme.css
+++ b/src/browser/base/content/zen-styles/zen-theme.css
@@ -161,15 +161,10 @@
 
   @media (-moz-windows-mica) or (-moz-platform: macos) {
     background: transparent;
-    --zen-themed-toolbar-bg-transparency: 0;
+    --zen-themed-toolbar-bg-transparent: transparent;
     @media (-moz-bool-pref: 'zen.widget.windows.acrylic') {
-      --zen-themed-toolbar-bg-transparency: 15%;
+      --zen-themed-toolbar-bg-transparent: color-mix(in srgb, var(--zen-themed-toolbar-bg) 85%, transparent 15%);
     }
-    --zen-themed-toolbar-bg-transparent: color-mix(
-      in srgb,
-      var(--zen-themed-toolbar-bg) calc(100% - var(--zen-themed-toolbar-bg-transparency)),
-      transparent var(--zen-themed-toolbar-bg-transparency)
-    );
   }
 
   --toolbar-field-background-color: var(--zen-colors-input-bg) !important;
diff --git a/src/browser/base/zen-components/ZenPinnedTabManager.mjs b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
index 3bb7f747f..97a373cb0 100644
--- a/src/browser/base/zen-components/ZenPinnedTabManager.mjs
+++ b/src/browser/base/zen-components/ZenPinnedTabManager.mjs
@@ -615,68 +615,70 @@
       document.getElementById('context_zen-pinned-tab-separator').hidden = !isVisible;
     }
 
-    moveToAnotherTabContainerIfNecessary(event, draggedTab) {
+    moveToAnotherTabContainerIfNecessary(event, movingTabs) {
       const pinnedTabsTarget =
         event.target.closest('#vertical-pinned-tabs-container') || event.target.closest('.zen-current-workspace-indicator');
       const essentialTabsTarget = event.target.closest('#zen-essentials-container');
       const tabsTarget = event.target.closest('#tabbrowser-arrowscrollbox');
 
-      let moved = false;
       let isVertical = this.expandedSidebarMode;
-      let isRegularTabs = false;
-      // Check for pinned tabs container
-      if (pinnedTabsTarget) {
-        if (!draggedTab.pinned) {
-          gBrowser.pinTab(draggedTab);
-          moved = true;
-        } else if (draggedTab.hasAttribute('zen-essential')) {
-          this.removeEssentials(draggedTab);
-          gBrowser.pinTab(draggedTab);
-          moved = true;
-        }
-      }
-      // Check for essentials container
-      else if (essentialTabsTarget) {
-        if (!draggedTab.hasAttribute('zen-essential')) {
-          this.addToEssentials(draggedTab);
-          moved = true;
-          isVertical = false;
-        }
-      }
-      // Check for normal tabs container
-      else if (tabsTarget || event.target.id === 'zen-tabs-wrapper') {
-        if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
-          gBrowser.unpinTab(draggedTab);
-          moved = true;
-          isRegularTabs = true;
-        } else if (draggedTab.hasAttribute('zen-essential')) {
-          this.removeEssentials(draggedTab);
-          moved = true;
-          isRegularTabs = true;
-        }
-      }
-
-      // If the tab was moved, adjust its position relative to the target tab
-      if (moved) {
-        const targetTab = event.target.closest('.tabbrowser-tab');
-        if (targetTab) {
-          const rect = targetTab.getBoundingClientRect();
-          let newIndex = targetTab._tPos;
-
-          if (isVertical) {
-            const middleY = targetTab.screenY + rect.height / 2;
-            if (!isRegularTabs && event.screenY > middleY) {
-              newIndex++;
-            } else if (isRegularTabs && event.screenY < middleY) {
-              newIndex--;
-            }
-          } else {
-            const middleX = targetTab.screenX + rect.width / 2;
-            if (event.screenX > middleX) {
-              newIndex++;
-            }
+      let moved = false;
+      for (const draggedTab of movingTabs) {
+        let isRegularTabs = false;
+        // Check for pinned tabs container
+        if (pinnedTabsTarget) {
+          if (!draggedTab.pinned) {
+            gBrowser.pinTab(draggedTab);
+            moved = true;
+          } else if (draggedTab.hasAttribute('zen-essential')) {
+            this.removeEssentials(draggedTab);
+            gBrowser.pinTab(draggedTab);
+            moved = true;
+          }
+        }
+        // Check for essentials container
+        else if (essentialTabsTarget) {
+          if (!draggedTab.hasAttribute('zen-essential')) {
+            this.addToEssentials(draggedTab);
+            moved = true;
+            isVertical = false;
+          }
+        }
+        // Check for normal tabs container
+        else if (tabsTarget || event.target.id === 'zen-tabs-wrapper') {
+          if (draggedTab.pinned && !draggedTab.hasAttribute('zen-essential')) {
+            gBrowser.unpinTab(draggedTab);
+            moved = true;
+            isRegularTabs = true;
+          } else if (draggedTab.hasAttribute('zen-essential')) {
+            this.removeEssentials(draggedTab);
+            moved = true;
+            isRegularTabs = true;
+          }
+        }
+
+        // If the tab was moved, adjust its position relative to the target tab
+        if (moved) {
+          const targetTab = event.target.closest('.tabbrowser-tab');
+          if (targetTab) {
+            const rect = targetTab.getBoundingClientRect();
+            let newIndex = targetTab._tPos;
+
+            if (isVertical) {
+              const middleY = targetTab.screenY + rect.height / 2;
+              if (!isRegularTabs && event.screenY > middleY) {
+                newIndex++;
+              } else if (isRegularTabs && event.screenY < middleY) {
+                newIndex--;
+              }
+            } else {
+              const middleX = targetTab.screenX + rect.width / 2;
+              if (event.screenX > middleX) {
+                newIndex++;
+              }
+            }
+            gBrowser.moveTabTo(draggedTab, newIndex);
           }
-          gBrowser.moveTabTo(draggedTab, newIndex);
         }
       }
 
diff --git a/src/browser/components/tabbrowser/content/tabs-js.patch b/src/browser/components/tabbrowser/content/tabs-js.patch
index 878c2193a..03326222f 100644
--- a/src/browser/components/tabbrowser/content/tabs-js.patch
+++ b/src/browser/components/tabbrowser/content/tabs-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabs.js b/browser/components/tabbrowser/content/tabs.js
-index 8aeb244ffca9f48661805f5b7d860b5896055562..3d323615040dcb5e379519878fb7874d5b28de81 100644
+index 8aeb244ffca9f48661805f5b7d860b5896055562..393458caa425e0a980223cd3800ea0ef33542c84 100644
 --- a/browser/components/tabbrowser/content/tabs.js
 +++ b/browser/components/tabbrowser/content/tabs.js
 @@ -94,7 +94,7 @@
@@ -52,7 +52,7 @@ index 8aeb244ffca9f48661805f5b7d860b5896055562..3d323615040dcb5e379519878fb7874d
        this._tabDropIndicator.hidden = true;
        event.stopPropagation();
 +      if (draggedTab && dropEffect == "move") {
-+        let moved = gZenPinnedTabManager.moveToAnotherTabContainerIfNecessary(event, draggedTab);
++        let moved = gZenPinnedTabManager.moveToAnotherTabContainerIfNecessary(event, movingTabs);
 +
 +        if (moved) {
 +          this._finishMoveTogetherSelectedTabs(draggedTab);

From 1aea93a57b8974c9580959efff903740554a1753 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:08:40 +0100
Subject: [PATCH 40/44]

---
 .../tabbrowser/content/tabbrowser-js.patch    | 89 +++++++++++--------
 1 file changed, 51 insertions(+), 38 deletions(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 6790f1ba4..43ac69e29 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,8 +1,8 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b62093051cc9a 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f13966d8e2 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
-@@ -406,11 +406,39 @@
+@@ -406,11 +406,52 @@
        return this.tabContainer.visibleTabs;
      }
  
@@ -13,6 +13,19 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
 +          break;
 +        }
 +        if (!tab.hidden) {
++          i += !tab.hasAttribute("zen-glance-tab");
++        }
++      }
++      return i;
++    }
++
++    get _numVisiblePinTabsWithoutGlance() {
++      let i = 0;
++      for (let tab of this.tabs) {
++        if (!tab.pinned) {
++          break;
++        }
++        if (!tab.hidden && !tab.hasAttribute("zen-glance-tab")) {
 +          i++;
 +        }
 +      }
@@ -26,7 +39,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
 +          break;
 +        }
 +        if (!tab.hidden) {
-+          i++;
++          i += !tab.hasAttribute("zen-glance-tab");
 +        }
 +      }
 +      return i;
@@ -40,11 +53,11 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
 +        if (!tab.pinned && !tab.hasAttribute("zen-glance-tab")) {
            break;
          }
-+        i++;
++        i += !tab.hasAttribute("zen-glance-tab");
        }
        return i;
      }
-@@ -807,7 +835,7 @@
+@@ -807,7 +848,7 @@
        this.showTab(aTab);
        if (this.tabContainer.verticalMode) {
          this._handleTabMove(aTab, () =>
@@ -53,7 +66,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          );
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount, { forceStandaloneTab: true });
-@@ -828,7 +856,7 @@
+@@ -828,7 +869,7 @@
            // the moving of a tab from the vertical pinned tabs container
            // and back into arrowscrollbox.
            aTab.removeAttribute("pinned");
@@ -62,7 +75,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          });
        } else {
          this.moveTabTo(aTab, this.pinnedTabCount - 1, {
-@@ -1055,6 +1083,8 @@
+@@ -1055,6 +1096,8 @@
  
        let LOCAL_PROTOCOLS = ["chrome:", "about:", "resource:", "data:"];
  
@@ -71,7 +84,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (
          aIconURL &&
          !aLoadingPrincipal &&
-@@ -1065,6 +1095,9 @@
+@@ -1065,6 +1108,9 @@
          );
          return;
        }
@@ -81,7 +94,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
  
        let browser = this.getBrowserForTab(aTab);
        browser.mIconURL = aIconURL;
-@@ -1310,6 +1343,7 @@
+@@ -1310,6 +1356,7 @@
        if (!this._previewMode) {
          newTab.recordTimeFromUnloadToReload();
          newTab.updateLastAccessed();
@@ -89,7 +102,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          oldTab.updateLastAccessed();
          // if this is the foreground window, update the last-seen timestamps.
          if (this.ownerGlobal == BrowserWindowTracker.getTopWindow()) {
-@@ -1462,6 +1496,9 @@
+@@ -1462,6 +1509,9 @@
        }
  
        let activeEl = document.activeElement;
@@ -99,7 +112,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
-@@ -2387,7 +2424,7 @@
+@@ -2387,7 +2437,7 @@
  
        let panel = this.getPanel(browser);
        let uniqueId = this._generateUniquePanelID();
@@ -108,7 +121,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        aTab.linkedPanel = uniqueId;
  
        // Inject the <browser> into the DOM if necessary.
-@@ -2446,8 +2483,8 @@
+@@ -2446,8 +2496,8 @@
        // If we transitioned from one browser to two browsers, we need to set
        // hasSiblings=false on both the existing browser and the new browser.
        if (this.tabs.length == 2) {
@@ -119,7 +132,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        } else {
          aTab.linkedBrowser.browsingContext.hasSiblings = this.tabs.length > 1;
        }
-@@ -2679,6 +2716,12 @@
+@@ -2679,6 +2729,12 @@
          );
        }
  
@@ -132,7 +145,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (!UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.start("browser.tabs.opening", "initting", window);
        }
-@@ -2742,6 +2785,12 @@
+@@ -2742,6 +2798,12 @@
            noInitialLabel,
            skipBackgroundNotify,
          });
@@ -145,7 +158,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          if (insertTab) {
            // insert the tab into the tab container in the correct position
            this._insertTabAtIndex(t, {
-@@ -2885,6 +2934,9 @@
+@@ -2885,6 +2947,9 @@
          }
        }
  
@@ -155,7 +168,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        // Additionally send pinned tab events
        if (pinned) {
          this._notifyPinnedStatus(t);
-@@ -3403,6 +3455,21 @@
+@@ -3403,6 +3468,21 @@
          ) {
            tabWasReused = true;
            tab = this.selectedTab;
@@ -177,7 +190,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
            if (!tabData.pinned) {
              this.unpinTab(tab);
            } else {
-@@ -3416,6 +3483,7 @@
+@@ -3416,6 +3496,7 @@
              restoreTabsLazily && !select && !tabData.pinned;
  
            let url = "about:blank";
@@ -185,7 +198,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
            if (tabData.entries?.length) {
              let activeIndex = (tabData.index || tabData.entries.length) - 1;
              // Ensure the index is in bounds.
-@@ -3451,7 +3519,21 @@
+@@ -3451,7 +3532,21 @@
              skipLoad: true,
              preferredRemoteType,
            });
@@ -208,7 +221,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
            if (select) {
              tabToSelect = tab;
            }
-@@ -3464,8 +3546,8 @@
+@@ -3464,8 +3559,8 @@
            // inserted in the DOM. If the tab is not yet in the DOM,
            // just insert it in the right place from the start.
            if (!tab.parentNode) {
@@ -219,7 +232,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
              tab.toggleAttribute("pinned", true);
              this.tabContainer._invalidateCachedTabs();
              // Then ensure all the tab open/pinning information is sent.
-@@ -3729,7 +3811,7 @@
+@@ -3729,7 +3824,7 @@
        // Ensure we have an index if one was not provided.
        if (typeof index != "number") {
          // Move the new tab after another tab if needed, to the end otherwise.
@@ -228,7 +241,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          if (
            !bulkOrderedOpen &&
            ((openerTab &&
-@@ -3780,7 +3862,7 @@
+@@ -3780,7 +3875,7 @@
        }
  
        /** @type {MozTabbrowserTab|undefined} */
@@ -237,7 +250,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        this.tabContainer._invalidateCachedTabs();
  
        if (tabGroup) {
-@@ -4095,6 +4177,9 @@
+@@ -4095,6 +4190,9 @@
          return;
        }
  
@@ -247,7 +260,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        this.removeTabs(selectedTabs);
      }
  
-@@ -4427,6 +4512,7 @@
+@@ -4427,6 +4525,7 @@
          skipSessionStore,
        } = {}
      ) {
@@ -255,7 +268,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (UserInteraction.running("browser.tabs.opening", window)) {
          UserInteraction.finish("browser.tabs.opening", window);
        }
-@@ -4443,6 +4529,12 @@
+@@ -4443,6 +4542,12 @@
          TelemetryStopwatch.start("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
        }
  
@@ -268,7 +281,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        // Handle requests for synchronously removing an already
        // asynchronously closing tab.
        if (!animate && aTab.closing) {
-@@ -4457,7 +4549,9 @@
+@@ -4457,7 +4562,9 @@
        // frame created for it (for example, by updating the visually selected
        // state).
        let tabWidth = window.windowUtils.getBoundsWithoutFlushing(aTab).width;
@@ -279,7 +292,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (
          !this._beginRemoveTab(aTab, {
            closeWindowFastpath: true,
-@@ -4471,7 +4565,6 @@
+@@ -4471,7 +4578,6 @@
          TelemetryStopwatch.cancel("FX_TAB_CLOSE_TIME_NO_ANIM_MS", aTab);
          return;
        }
@@ -287,7 +300,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        let lockTabSizing =
          !this.tabContainer.verticalMode &&
          !aTab.pinned &&
-@@ -4610,14 +4703,14 @@
+@@ -4610,14 +4716,14 @@
          !!this.tabsInCollapsedTabGroups.length;
        if (
          aTab.visible &&
@@ -304,7 +317,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
  
          if (closeWindow) {
            // We've already called beforeunload on all the relevant tabs if we get here,
-@@ -4812,6 +4905,8 @@
+@@ -4812,6 +4918,8 @@
          this.tabs[i]._tPos = i;
        }
  
@@ -313,7 +326,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (!this._windowIsClosing) {
          if (wasPinned) {
            this.tabContainer._positionPinnedTabs();
-@@ -5465,10 +5560,10 @@
+@@ -5465,10 +5573,10 @@
        SessionStore.deleteCustomTabValue(aTab, "hiddenBy");
      }
  
@@ -326,19 +339,19 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
          aTab.selected ||
          aTab.closing ||
          // Tabs that are sharing the screen, microphone or camera cannot be hidden.
-@@ -5706,9 +5801,9 @@
+@@ -5706,9 +5814,9 @@
  
        // Don't allow mixing pinned and unpinned tabs.
        if (aTab.pinned) {
 -        aIndex = Math.min(aIndex, this.pinnedTabCount - 1);
-+        aIndex = Math.min(aIndex, this._numVisiblePinTabs - 1);
++        aIndex = Math.min(aIndex, (aTab.hasAttribute('zen-essential') ? this._numZenEssentials : this._numVisiblePinTabsWithoutGlance) - 1);
        } else {
 -        aIndex = Math.max(aIndex, this.pinnedTabCount);
-+        aIndex = Math.max(aIndex, this._numVisiblePinTabs);
++        aIndex = Math.max(aIndex, this._numVisiblePinTabsWithoutGlance);
        }
        if (aTab._tPos == aIndex) {
          return;
-@@ -5727,6 +5822,9 @@
+@@ -5727,6 +5835,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }
        });
@@ -348,7 +361,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
      }
  
      moveTabToGroup(aTab, aGroup) {
-@@ -5802,7 +5900,7 @@
+@@ -5802,7 +5913,7 @@
          createLazyBrowser,
        };
  
@@ -357,7 +370,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
        if (aIndex < numPinned || (aTab.pinned && aIndex == numPinned)) {
          params.pinned = true;
        }
-@@ -7443,6 +7541,7 @@
+@@ -7443,6 +7554,7 @@
              aWebProgress.isTopLevel
            ) {
              this.mTab.setAttribute("busy", "true");
@@ -365,7 +378,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
              gBrowser._tabAttrModified(this.mTab, ["busy"]);
              this.mTab._notselectedsinceload = !this.mTab.selected;
              gBrowser.syncThrobberAnimations(this.mTab);
-@@ -8411,7 +8510,7 @@ var TabContextMenu = {
+@@ -8411,7 +8523,7 @@ var TabContextMenu = {
      );
      contextUnpinSelectedTabs.hidden =
        !this.contextTab.pinned || !multiselectionContext;
@@ -374,7 +387,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
      // Move Tab items
      let contextMoveTabOptions = document.getElementById(
        "context_moveTabOptions"
-@@ -8444,7 +8543,7 @@ var TabContextMenu = {
+@@ -8444,7 +8556,7 @@ var TabContextMenu = {
      let contextMoveTabToStart = document.getElementById("context_moveToStart");
      let isFirstTab =
        tabsToMove[0] == visibleTabs[0] ||
@@ -383,7 +396,7 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..5db2380df21f4b25a6c03bfa457b6209
      contextMoveTabToStart.disabled = isFirstTab && allSelectedTabsAdjacent;
  
      document.getElementById("context_openTabInWindow").disabled =
-@@ -8677,6 +8776,7 @@ var TabContextMenu = {
+@@ -8677,6 +8789,7 @@ var TabContextMenu = {
      if (this.contextTab.multiselected) {
        gBrowser.removeMultiSelectedTabs();
      } else {

From e3bcffdd6b9462b98787ebf347eb87ba28a50444 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:26:32 +0100
Subject: [PATCH 41/44] Refactor vertical-tabs.css to enhance tab background
 styling and improve layout consistency

---
 .../zen-styles/zen-tabs/vertical-tabs.css     | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 286493476..7f0312f38 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -280,10 +280,6 @@
       }
     }
 
-    &[selected] .tab-background {
-      backdrop-filter: blur(10px);
-    }
-
     @media (-moz-bool-pref: 'zen.tabs.dim-pending') {
       &[pending='true'] .tab-icon-image {
         opacity: 0.5;
@@ -326,13 +322,18 @@
     /* On essentials, glance tabs are floating */
     &[zen-essential='true'] .tabbrowser-tab {
       position: absolute;
-      top: 4px;
-      right: 4px;
-      --tab-collapsed-width: 35px;
+      top: 0px;
+      right: 0px;
+      --tab-collapsed-width: 34px;
       --tab-min-height: 16px;
       width: var(--tab-collapsed-width) !important;
       z-index: 1;
       pointer-events: none;
+      & .tab-background {
+        /* Solid colors because we don't want to show the background */
+        background: light-dark(rgb(249, 249, 249), rgb(63, 63, 63)) !important;
+        border: 2px solid light-dark(rgba(0, 0, 0, 0.4), rgba(255, 255, 255, 0.4));
+      }
     }
   }
 }
@@ -954,7 +955,7 @@
   padding: 0;
 }
 
-#zen-essentials-container .tabbrowser-tab {
+#zen-essentials-container > .tabbrowser-tab {
   --toolbarbutton-inner-padding: 0;
   max-width: unset;
   width: 100% !important;
@@ -994,7 +995,7 @@
   }
 
   @media (-moz-bool-pref: 'zen.theme.essentials-favicon-bg') {
-    &[visuallyselected] .tab-background {
+    &[visuallyselected] > .tab-stack > .tab-background {
       &::after {
         content: "";
         inset: -50%;

From 1eb04862fcf0f3538e645aab6e877e3190f789c9 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:29:45 +0100
Subject: [PATCH 42/44] Remove update-submodules workflow file to streamline CI
 processes

---
 .github/workflows/update-submodules.yml | 31 -------------------------
 1 file changed, 31 deletions(-)
 delete mode 100644 .github/workflows/update-submodules.yml

diff --git a/.github/workflows/update-submodules.yml b/.github/workflows/update-submodules.yml
deleted file mode 100644
index 18fa6cc26..000000000
--- a/.github/workflows/update-submodules.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-name: Update Components Submodules
-
-on:
-  push:
-    branches:
-      - dev
-  workflow_dispatch:
-  workflow_call:
-
-jobs:
-  update-submodules:
-    runs-on: ubuntu-latest
-    if: "!contains(github.event.head_commit.message, '[skip ci]')"
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          token: ${{ secrets.DEPLOY_KEY }}
-
-      - name: Update submodules
-        run: |
-          git submodule update --remote --merge
-
-      - name: Commit
-        uses: stefanzweifel/git-auto-commit-action@v5
-        with:
-          commit_message: '[skip ci] 📦 Update submodules'
-          commit_user_name: Zen Browser Robot
-          commit_user_email: zen-browser-auto@users.noreply.github.com

From 25b41f8bb6479cfd68c9204395949f890c712187 Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 01:49:22 +0100
Subject: [PATCH 43/44] Enhance tab label handling to support static labels and
 filter glance tabs during tab movement

---
 .../tabbrowser/content/tabbrowser-js.patch    | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/browser/components/tabbrowser/content/tabbrowser-js.patch b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
index 43ac69e29..3a56da16a 100644
--- a/src/browser/components/tabbrowser/content/tabbrowser-js.patch
+++ b/src/browser/components/tabbrowser/content/tabbrowser-js.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
-index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f13966d8e2 100644
+index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..8f2cd9ecd708e58a6b162740bb21dafeda43b085 100644
 --- a/browser/components/tabbrowser/content/tabbrowser.js
 +++ b/browser/components/tabbrowser/content/tabbrowser.js
 @@ -406,11 +406,52 @@
@@ -112,6 +112,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f1
        // If focus is on the old tab, move it to the new tab.
        if (activeEl == oldTab) {
          newTab.focus();
+@@ -1785,7 +1835,7 @@
+     }
+ 
+     _setTabLabel(aTab, aLabel, { beforeTabOpen, isContentTitle, isURL } = {}) {
+-      if (!aLabel || aLabel.includes("about:reader?")) {
++      if (!aLabel || aLabel.includes("about:reader?") || aTab.hasAttribute("zen-has-static-label")) {
+         return false;
+       }
+ 
 @@ -2387,7 +2437,7 @@
  
        let panel = this.getPanel(browser);
@@ -351,6 +360,15 @@ index ff90a70bdad6c94ec4b90027ff102972d0eb28e5..545a6122bc6d6ee55dab7f020cfbe1f1
        }
        if (aTab._tPos == aIndex) {
          return;
+@@ -5717,7 +5825,7 @@
+       this._lastRelatedTabMap = new WeakMap();
+ 
+       this._handleTabMove(aTab, () => {
+-        let neighbor = this.tabs[aIndex];
++        let neighbor = this.tabs.filter(tab => !tab.hasAttribute("zen-glance-tab"))[aIndex];
+         if (forceStandaloneTab && neighbor.group) {
+           neighbor = neighbor.group;
+         }
 @@ -5727,6 +5835,9 @@
            this.tabContainer.insertBefore(aTab, neighbor);
          }

From a5e34fc9a556810c05b832e1f0c121ab7c81056e Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Sat, 15 Feb 2025 02:10:37 +0100
Subject: [PATCH 44/44] Refactor tab renaming logic to ensure consistent label
 handling and add animation effect; update CSS for vertical tabs to improve
 styling

---
 src/browser/base/content/ZenUIManager.mjs             | 11 ++++++++++-
 .../content/zen-styles/zen-tabs/vertical-tabs.css     |  3 +++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index de6c363ae..f09b26044 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -624,14 +624,23 @@ var gZenVerticalTabsManager = {
       let newName = input.value.trim();
 
       // Check if name is blank, reset if so
+      // Always remove, so we can always rename and if it's empty,
+      // it will reset to the original name anyway
+      this._tabEdited.removeAttribute('zen-has-static-label');
       if (newName) {
         gBrowser._setTabLabel(this._tabEdited, newName);
         this._tabEdited.setAttribute('zen-has-static-label', 'true');
       } else {
-        this._tabEdited.removeAttribute('zen-has-static-label');
         gBrowser.setTabTitle(this._tabEdited);
       }
 
+      // Maybe add some confetti here?!?
+      gZenUIManager.motion.animate(this._tabEdited, {
+        scale: [1, 0.98, 1],
+      }, {
+        duration: 0.25,
+      });
+
       this._tabEdited.querySelector('.tab-editor-container').remove();
       label.classList.remove('tab-label-container-editing');
 
diff --git a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
index 0ca35b4f0..eeab85cdb 100644
--- a/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
+++ b/src/browser/base/content/zen-styles/zen-tabs/vertical-tabs.css
@@ -1148,6 +1148,9 @@
   white-space: nowrap;
   overflow-x: scroll;
   margin: 0;
+  background: transparent;
+  border: none;
+  padding: 0;
 }
 
 /* Section: tab workspaces stylings */