From dcfebe65953d2df64d5e529048436bca89dc5f0e Mon Sep 17 00:00:00 2001
From: "mr. M" <mauro.balades@tutanota.com>
Date: Thu, 2 Jan 2025 13:31:23 +0100
Subject: [PATCH] Fixed compact mode sidebar not closing when opening an
 extension dialog pinned to the sidebar

---
 src/browser/base/content/zen-styles/zen-browser-ui.css   | 3 +++
 src/browser/base/content/zen-styles/zen-compact-mode.css | 2 +-
 .../base/content/zen-styles/zen-tabs/vertical-tabs.css   | 6 ++++--
 src/browser/base/content/zen-styles/zen-workspaces.css   | 2 +-
 src/browser/base/zen-components/ZenGradientGenerator.mjs | 5 +++++
 src/browser/base/zen-components/ZenWorkspaces.mjs        | 9 ++++++++-
 6 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/browser/base/content/zen-styles/zen-browser-ui.css b/src/browser/base/content/zen-styles/zen-browser-ui.css
index 852bb5178..1d103ad8a 100644
--- a/src/browser/base/content/zen-styles/zen-browser-ui.css
+++ b/src/browser/base/content/zen-styles/zen-browser-ui.css
@@ -41,6 +41,9 @@
     bottom: 0;
     z-index: 0;
     pointer-events: none;
+  }
+
+  &:not([post-animating='true'])::after {
     transition: background-color var(--inactive-window-transition);
   }
 
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 5df5f71b8..a22a2a4cf 100644
--- a/src/browser/base/content/zen-styles/zen-compact-mode.css
+++ b/src/browser/base/content/zen-styles/zen-compact-mode.css
@@ -205,7 +205,7 @@
         & #zen-appcontent-navbar-container:focus-within,
         & #zen-appcontent-navbar-container[zen-user-show],
         & #zen-appcontent-navbar-container[has-popup-menu],
-        & #zen-appcontent-navbar-container:has(*[panelopen='true']) {
+        & #zen-appcontent-navbar-container:has(*[panelopen='true'], [open='true']) {
           opacity: 1;
           border-top-width: 1px;
 
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 c663e0df0..91c292e43 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
@@ -239,12 +239,14 @@
     transition: scale 0.07s ease;
     #tabbrowser-tabs:not([dont-animate-tabs='true']) &[fadein='true']:not([zen-essential='true']) {
       #tabbrowser-tabs[zen-workspace-animation='previous'] & {
-        animation: zen-slide-in 0.3s ease;
+        animation: zen-slide-in 0.4s ease;
       }
 
       #tabbrowser-tabs[zen-workspace-animation='next'] & {
-        animation: zen-slide-in-reverse 0.3s ease;
+        animation: zen-slide-in-reverse 0.4s ease;
       }
+
+      animation-delay: 0.2s;
     }
 
     &:not([zen-essential='true']):active {
diff --git a/src/browser/base/content/zen-styles/zen-workspaces.css b/src/browser/base/content/zen-styles/zen-workspaces.css
index c9ee2be91..406a21707 100644
--- a/src/browser/base/content/zen-styles/zen-workspaces.css
+++ b/src/browser/base/content/zen-styles/zen-workspaces.css
@@ -272,7 +272,7 @@
   display: flex;
   flex-wrap: wrap;
   justify-content: flex-start;
-  gap: 2px;
+  gap: 5px;
 }
 
 #PanelUI-zen-workspaces-icon-search-bar {
diff --git a/src/browser/base/zen-components/ZenGradientGenerator.mjs b/src/browser/base/zen-components/ZenGradientGenerator.mjs
index b1e636d8e..51c622329 100644
--- a/src/browser/base/zen-components/ZenGradientGenerator.mjs
+++ b/src/browser/base/zen-components/ZenGradientGenerator.mjs
@@ -629,7 +629,12 @@
             setTimeout(() => {
               this._animatingBackground = false;
               appWrapper.removeAttribute('animating');
+              appWrapper.setAttribute('post-animating', 'true');
               browser.document.documentElement.style.removeProperty('--zen-main-browser-background-old');
+              setTimeout(() => {
+                // Reactivate the transition after the animation
+                appWrapper.removeAttribute('post-animating');
+              });
             }, 700);
           });
         }
diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
index 52d890bab..bb24a1edf 100644
--- a/src/browser/base/zen-components/ZenWorkspaces.mjs
+++ b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -685,6 +685,13 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     event.preventDefault();
     const parentPanel = document.getElementById('PanelUI-zen-workspaces-edit');
     PanelUI.showSubView('PanelUI-zen-workspaces-icon-picker', parentPanel);
+
+    const container = parentPanel.parentNode.querySelector('.panel-viewcontainer');
+    setTimeout(() => {
+      if (container) {
+        container.style.minHeight = 'unset';
+      }
+    });
   }
 
   goToPreviousSubView() {
@@ -1311,7 +1318,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
       setTimeout(() => {
         this._animatingChange = false;
         gBrowser.tabContainer.removeAttribute('zen-workspace-animation');
-      }, 300);
+      }, 500);
     }
   }