From 6250e9dfb2cebb6cc043fdce91bc0aeb6191b8bb Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Thu, 1 May 2025 20:51:20 +0200
Subject: [PATCH] fix: Common fixed before release, b=(no-bug), c=tabs,
 workspaces

---
 src/zen/tabs/zen-tabs/vertical-tabs.css | 11 +++++++++--
 src/zen/workspaces/ZenWorkspaces.mjs    |  7 ++++++-
 src/zen/workspaces/zen-workspaces.css   |  6 +++---
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/zen/tabs/zen-tabs/vertical-tabs.css b/src/zen/tabs/zen-tabs/vertical-tabs.css
index d596f2815..0a62c3efd 100644
--- a/src/zen/tabs/zen-tabs/vertical-tabs.css
+++ b/src/zen/tabs/zen-tabs/vertical-tabs.css
@@ -1243,7 +1243,8 @@
    Mark: Essentials Toolbar / Section Styles
    ========================================================================== */
 
-#zen-essentials-wrapper {
+#zen-essentials-wrapper,
+#zen-current-workspace-indicator-container {
   margin-left: calc(-1 * var(--zen-toolbox-padding));
   min-width: calc(100% + var(--zen-toolbox-padding) * 2);
 }
@@ -1255,7 +1256,9 @@
   padding-bottom: var(--zen-toolbox-padding);
   overflow: hidden;
   gap: calc(var(--zen-toolbox-padding) - 2px);
-  transition: max-height 0.3s ease-out, grid-template-rows 0.3s ease-out;
+  transition:
+    max-height 0.3s ease-out,
+    grid-template-rows 0.3s ease-out;
   opacity: 1;
   grid-template-columns: repeat(auto-fit, minmax(max(23.7%, 48px), 1fr));
   &[data-hack-type='1'] {
@@ -1271,6 +1274,10 @@
   min-width: calc(100% + var(--zen-toolbox-padding) * 2);
   padding: 0 var(--zen-toolbox-padding);
   display: grid;
+
+  &[hidden='true'] {
+    max-width: var(--actual-zen-sidebar-width); /* To still allow essentials to grid the tabs */
+  }
 }
 
 /* Style tabs within the Essentials container (and a related welcome sidebar) */
diff --git a/src/zen/workspaces/ZenWorkspaces.mjs b/src/zen/workspaces/ZenWorkspaces.mjs
index 6c9275216..458617e22 100644
--- a/src/zen/workspaces/ZenWorkspaces.mjs
+++ b/src/zen/workspaces/ZenWorkspaces.mjs
@@ -1942,7 +1942,12 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       } else {
         container.removeAttribute('hidden');
       }
-      if (nextWorkspaceContextId !== workspaceContextId && offsetPixels && this.containerSpecificEssentials) {
+      if (
+        nextWorkspaceContextId !== workspaceContextId &&
+        offsetPixels &&
+        this.containerSpecificEssentials &&
+        container.getAttribute('container') == nextWorkspaceContextId
+      ) {
         container.removeAttribute('hidden');
         // Animate from the currently selected workspace
         if (container.getAttribute('container') == workspaceContextId) {
diff --git a/src/zen/workspaces/zen-workspaces.css b/src/zen/workspaces/zen-workspaces.css
index 94d9b4bf3..4a42f09f8 100644
--- a/src/zen/workspaces/zen-workspaces.css
+++ b/src/zen/workspaces/zen-workspaces.css
@@ -460,7 +460,7 @@
 }
 
 .zen-current-workspace-indicator {
-  padding: calc(15px + var(--zen-toolbox-padding)) calc(4px + var(--tab-inline-padding));
+  padding: calc(15px + var(--zen-toolbox-padding)) calc(4px + var(--tab-inline-padding) + var(--zen-toolbox-padding));
   font-weight: 600;
   position: absolute;
   max-height: var(--zen-workspace-indicator-height);
@@ -479,8 +479,8 @@
     content: '';
     position: absolute;
     top: var(--zen-toolbox-padding);
-    left: calc(var(--zen-toolbox-padding) / 2);
-    width: calc(100% - var(--zen-toolbox-padding));
+    left: calc(var(--zen-toolbox-padding) + 2px);
+    width: calc(100% - var(--zen-toolbox-padding) * 2 - 4px);
     height: calc(100% - var(--zen-toolbox-padding) * 2);
   }