From 2942ab3c08737810cbcaf7f3f07a455d4f0da6de Mon Sep 17 00:00:00 2001
From: "Mr. M" <mr.m@tuta.com>
Date: Mon, 5 May 2025 22:54:58 +0200
Subject: [PATCH] fix: Fixed transitions on the urlbar while closing,
 b=(no-bug), c=common, compact-mode

---
 .../preferences/zenLooksAndFeel.inc.xhtml          |  3 ---
 .../preferences/zenTabsManagement.inc.xhtml        |  1 -
 .../components/urlbar/UrlbarInput-sys-mjs.patch    | 14 +++++++-------
 src/zen/common/styles/zen-urlbar.css               |  7 +++++--
 src/zen/compact-mode/ZenCompactMode.mjs            |  4 ++--
 src/zen/compact-mode/zen-compact-mode.css          |  2 +-
 6 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
index 59fc7dcf9..b3f3987b9 100644
--- a/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
+++ b/src/browser/components/preferences/zenLooksAndFeel.inc.xhtml
@@ -78,9 +78,6 @@
 </hbox>
 
 <groupbox id="zenThemeGroup" data-category="paneZenLooks" hidden="true" class="highlighting-group">
-      <label><html:h2 data-l10n-id="zen-look-and-feel-urlbar-header"/></label>
-      <description class="description-deemphasized" data-l10n-id="zen-look-and-feel-urlbar-description" />
-
       <label><html:h2 data-l10n-id="zen-look-and-feel-compact-view-header"/></label>
       <description class="description-deemphasized" data-l10n-id="zen-look-and-feel-compact-view-description" />
 
diff --git a/src/browser/components/preferences/zenTabsManagement.inc.xhtml b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
index ed1ef4432..6c6e92954 100644
--- a/src/browser/components/preferences/zenTabsManagement.inc.xhtml
+++ b/src/browser/components/preferences/zenTabsManagement.inc.xhtml
@@ -3,7 +3,6 @@
       class="subcategory"
       hidden="true"
       data-category="paneZenTabManagement">
-<html:h1 data-l10n-id="pane-workspaces-title"/>
 </hbox>
 
 <hbox id="zenTabManagementCategory"
diff --git a/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch b/src/browser/components/urlbar/UrlbarInput-sys-mjs.patch
index 954d10253..dcec6f8dc 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 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..a05dfd9b28c0c082579a5b53386de9ffbfc5e737 100644
+index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..2c9920252aad3ae1528fc8e92906c4f1ccc11c75 100644
 --- a/browser/components/urlbar/UrlbarInput.sys.mjs
 +++ b/browser/components/urlbar/UrlbarInput.sys.mjs
 @@ -68,6 +68,13 @@ XPCOMUtils.defineLazyPreferenceGetter(
@@ -21,14 +21,14 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..a05dfd9b28c0c082579a5b53386de9ff
      // event but does not set the primary selection.
      this._suppressPrimaryAdjustment = true;
 +    const zenToolbox = this.document.getElementById("navigator-toolbox");
-+    zenToolbox.setAttribute("supress-primary-adjustment", !(
++    this.window.document.documentElement.setAttribute("supress-primary-adjustment", !(
 +      zenToolbox.hasAttribute("zen-has-hover") ||
 +      zenToolbox.hasAttribute("zen-has-empty-tab") ||
 +      zenToolbox.hasAttribute("zen-user-show")
 +    ));
      this.inputField.select();
 +    this.document.ownerGlobal.setTimeout(() => {
-+      zenToolbox.removeAttribute("supress-primary-adjustment");
++      this.window.document.documentElement.removeAttribute("supress-primary-adjustment");
 +    }, 0);
      this._suppressPrimaryAdjustment = false;
    }
@@ -50,14 +50,14 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..a05dfd9b28c0c082579a5b53386de9ff
      }
 -
 +    const zenToolbox = this.document.getElementById("navigator-toolbox");
-+    zenToolbox.setAttribute("supress-primary-adjustment", !(
++    this.window.document.documentElement.setAttribute("supress-primary-adjustment", !(
 +      zenToolbox.hasAttribute("zen-has-hover") ||
 +      zenToolbox.hasAttribute("zen-has-empty-tab") ||
 +      zenToolbox.hasAttribute("zen-user-show")
 +    ));
      this.handleNavigation({ event });
 +    this.document.ownerGlobal.setTimeout(() => {
-+      zenToolbox.removeAttribute("supress-primary-adjustment");
++      this.window.document.documentElement.removeAttribute("supress-primary-adjustment");
 +    }, 0);
    }
  
@@ -109,14 +109,14 @@ index 4b69136aa31bfef3a1d3b57ad0c75fe07fa26be0..a05dfd9b28c0c082579a5b53386de9ff
 +    
 +    // Arc like URLbar: Blur the input on exit
 +    const zenToolbox = this.document.getElementById("navigator-toolbox");
-+    zenToolbox.setAttribute("supress-primary-adjustment", !(
++    this.window.document.documentElement.setAttribute("supress-primary-adjustment", !(
 +      zenToolbox.hasAttribute("zen-has-hover") ||
 +      zenToolbox.hasAttribute("zen-has-empty-tab") ||
 +      zenToolbox.hasAttribute("zen-user-show")
 +    ));
 +    this.window.gBrowser.selectedBrowser.focus();
 +    this.document.ownerGlobal.setTimeout(() => {
-+      zenToolbox.removeAttribute("supress-primary-adjustment");
++      this.window.document.documentElement.removeAttribute("supress-primary-adjustment");
 +    }, 0);
 +    
 +    this.removeAttribute("zen-floating-urlbar");
diff --git a/src/zen/common/styles/zen-urlbar.css b/src/zen/common/styles/zen-urlbar.css
index f8c5835c5..46bbefe10 100644
--- a/src/zen/common/styles/zen-urlbar.css
+++ b/src/zen/common/styles/zen-urlbar.css
@@ -60,7 +60,7 @@
 }
 
 #urlbar:not([breakout-extend='true']) {
-  & #urlbar-background {
+  :root:not([supress-primary-adjustment]) & #urlbar-background {
     transition: background-color 0.15s ease;
   }
 
@@ -186,8 +186,11 @@
   #identity-box:not([pageproxystate='invalid']) #identity-icon-box:not([open]) {
     margin-inline-start: calc(-8px - 2 * var(--urlbar-icon-padding));
     transform: translateX(100%);
-    transition: all 0.1s ease;
     opacity: 0;
+
+    :root:not([supress-primary-adjustment]) & {
+      transition: all 0.1s ease;
+    }
   }
 
   #identity-permission-box > *:not(#permissions-granted-icon) {
diff --git a/src/zen/compact-mode/ZenCompactMode.mjs b/src/zen/compact-mode/ZenCompactMode.mjs
index e2c43e6ff..b69d1a362 100644
--- a/src/zen/compact-mode/ZenCompactMode.mjs
+++ b/src/zen/compact-mode/ZenCompactMode.mjs
@@ -436,7 +436,7 @@ var gZenCompactModeManager = {
           if (event.type === 'mouseenter' && !event.target.matches(':hover')) return;
           // Dont register the hover if the urlbar is floating and we are hovering over it
           this.clearFlashTimeout('has-hover' + target.id);
-          if (this.sidebar.getAttribute('supress-primary-adjustment') === 'true' || this._hasHoveredUrlbar) {
+          if (document.documentElement.getAttribute('supress-primary-adjustment') === 'true' || this._hasHoveredUrlbar) {
             return;
           }
           window.requestAnimationFrame(() => target.setAttribute('zen-has-hover', 'true'));
@@ -469,7 +469,7 @@ var gZenCompactModeManager = {
 
         if (
           event.explicitOriginalTarget.closest('#urlbar[zen-floating-urlbar]') ||
-          this.sidebar.getAttribute('supress-primary-adjustment') === 'true' ||
+          document.documentElement.getAttribute('supress-primary-adjustment') === 'true' ||
           this._hasHoveredUrlbar
         ) {
           return;
diff --git a/src/zen/compact-mode/zen-compact-mode.css b/src/zen/compact-mode/zen-compact-mode.css
index a9c66f99f..3f570559b 100644
--- a/src/zen/compact-mode/zen-compact-mode.css
+++ b/src/zen/compact-mode/zen-compact-mode.css
@@ -278,7 +278,7 @@
             left var(--zen-compact-mode-time) var(--zen-compact-mode-func),
             right var(--zen-compact-mode-time) var(--zen-compact-mode-func);
 
-          &:not([supress-primary-adjustment='true']) {
+          :root:not([supress-primary-adjustment='true']) & {
             & #titlebar {
               transition: none;
               visibility: visible;