From e65b786b46bc513d14e1e00cf369b90d1c5402b0 Mon Sep 17 00:00:00 2001
From: "mr. m" <mr.m@tuta.com>
Date: Fri, 11 Apr 2025 01:00:47 +0200
Subject: [PATCH] Adjust sidebar width calculation in non-compact mode and
 update compact mode CSS for proper width handling

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

diff --git a/src/browser/base/content/ZenUIManager.mjs b/src/browser/base/content/ZenUIManager.mjs
index 7e4aa02d5..6b3dd5d9a 100644
--- a/src/browser/base/content/ZenUIManager.mjs
+++ b/src/browser/base/content/ZenUIManager.mjs
@@ -656,7 +656,9 @@ var gZenVerticalTabsManager = {
       // Always move the splitter next to the sidebar
       this.navigatorToolbox.after(document.getElementById('zen-sidebar-splitter'));
       window.dispatchEvent(new Event('resize'));
-      gZenCompactModeManager.getAndApplySidebarWidth();
+      if (!isCompactMode) {
+        gZenCompactModeManager.getAndApplySidebarWidth();
+      }
       gZenUIManager.updateTabsToolbar();
     } catch (e) {
       console.error(e);
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 4cc77ab95..58147c0d6 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -117,7 +117,7 @@
         min-width: var(--zen-toolbox-min-width);
 
         :root[zen-sidebar-expanded='true'] & {
-          width: var(--zen-sidebar-width);
+          width: calc(var(--zen-sidebar-width) + var(--zen-toolbox-padding));
         }
 
         :root[zen-single-toolbar='true'] {