From 713f1486c3352bba1ff5a49b7e24b21d9a284c1d Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 11 Apr 2025 00:43:50 +0200
Subject: [PATCH] Refactor sidebar width calculation in compact mode and update
 toolbar separator logic

---
 src/browser/base/content/ZenUIManager.mjs             |  2 +-
 .../base/content/zen-styles/zen-compact-mode.css      |  3 +--
 src/browser/base/zen-components/ZenCompactMode.mjs    | 11 ++++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 14d7b974b..7e4aa02d5 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -544,7 +544,7 @@ var gZenVerticalTabsManager = {
         );
         elements = Array.from(elements).reverse();
         // Add separator if it doesn't exist
-        if (!buttonsTarget.contains(this._topButtonsSeparatorElement)) {
+        if (!this._hasSetSingleToolbar) {
           buttonsTarget.append(this._topButtonsSeparatorElement);
         }
         for (const button of elements) {
diff --git a/src/browser/base/content/zen-styles/zen-compact-mode.css b/src/browser/base/content/zen-styles/zen-compact-mode.css
index a476e04d4..4cc77ab95 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -116,9 +116,8 @@
         outline-offset: -1px;
         min-width: var(--zen-toolbox-min-width);
 
-        /* times 4 because we have the inner padding and the outter padding to consider */
         :root[zen-sidebar-expanded='true'] & {
-          width: calc(var(--zen-sidebar-width) - var(--zen-toolbox-padding));
+          width: var(--zen-sidebar-width);
         }
 
         :root[zen-single-toolbar='true'] {
diff --git a/src/browser/base/zen-components/ZenCompactMode.mjs b/src/browser/base/zen-components/ZenCompactMode.mjs
index ddf77f5bc..fa26ae112 100644
--- a/src/browser/base/zen-components/ZenCompactMode.mjs
+++ b/src/browser/base/zen-components/ZenCompactMode.mjs
@@ -220,10 +220,12 @@ var gZenCompactModeManager = {
         }
         if (canHideSidebar && isCompactMode) {
           const elementSeparation = ZenThemeModifier.elementSeparation;
-          sidebarWidth -= 0.5 * splitterWidth;
-          if (elementSeparation < splitterWidth) {
-            // Subtract from the splitter width to end up with the correct element separation
-            sidebarWidth += 1.5 * splitterWidth - elementSeparation;
+          if (document.documentElement.hasAttribute('zen-sidebar-expanded')) {
+            sidebarWidth -= 0.5 * splitterWidth;
+            if (elementSeparation < splitterWidth) {
+              // Subtract from the splitter width to end up with the correct element separation
+              sidebarWidth += 1.5 * splitterWidth - elementSeparation;
+            }
           }
           gZenUIManager.motion
             .animate(
@@ -242,7 +244,6 @@ var gZenCompactModeManager = {
             .then(() => {
               this.sidebar.style.transition = 'none';
               this.sidebar.style.opacity = 0;
-              this.getAndApplySidebarWidth();
               setTimeout(() => {
                 this.sidebar.removeAttribute('animate');
                 document.documentElement.removeAttribute('zen-compact-animating');