Refactor Zen UI components for improved toolbar button management and…

… layout adjustments
zen-browser · Jan 17, 2025 · ee86bff · ee86bff
1 parent 9fb04e4
commit ee86bff
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 13 deletions.
diff --git a/src/browser/base/content/ZenCustomizableUI.sys.mjs b/src/browser/base/content/ZenCustomizableUI.sys.mjs
@@ -11,7 +11,7 @@ export var ZenCustomizableUI = new (class {
       'zen-sidebar-top-buttons',
       {
         type: this.TYPE_TOOLBAR,
-        defaultPlacements: [],
+        defaultPlacements: [''],
         defaultCollapsed: null,
       },
       true
@@ -47,8 +47,6 @@ export var ZenCustomizableUI = new (class {
         customizationtarget="zen-sidebar-top-buttons-customization-target"
         mode="icons">
         <hbox id="zen-sidebar-top-buttons-customization-target" class="customization-target" flex="1">
-          <toolbarbutton removable="true" class="chromeclass-toolbar-additional toolbarbutton-1 zen-sidebar-action-button" id="zen-expand-sidebar-button" data-l10n-id="sidebar-zen-expand" cui-areatype="toolbar" oncommand="gZenVerticalTabsManager.toggleExpand();"></toolbarbutton>
-          <toolbarbutton removable="true" class="toolbarbutton-1 zen-sidebar-action-button zen-compact-mode-ignore" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>
         </hbox>
       </toolbar>
     `);

diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs
@@ -86,7 +86,7 @@
       }
 
       // remove all styles except for the width, since we are xulstoring the complet style list
-      const width = toolbox.style.width || '270px';
+      const width = toolbox.style.width || '180px';
       toolbox.removeAttribute('style');
       toolbox.style.width = width;
 

diff --git a/src/browser/base/content/zen-sidebar-icons.inc.xhtml b/src/browser/base/content/zen-sidebar-icons.inc.xhtml
@@ -7,6 +7,9 @@
   skipintoolbarset="true"
   context="toolbar-context-menu"
   mode="icons">
+  <toolbarbutton removable="true" class="chromeclass-toolbar-additional toolbarbutton-1 zen-sidebar-action-button" id="zen-expand-sidebar-button" data-l10n-id="sidebar-zen-expand" cui-areatype="toolbar" oncommand="gZenVerticalTabsManager.toggleExpand();"></toolbarbutton>
+  <toolbarbutton removable="true" class="toolbarbutton-1 zen-sidebar-action-button zen-compact-mode-ignore" id="zen-sidepanel-button" data-l10n-id="sidebar-zen-sidepanel" onclick="gZenBrowserManagerSidebar.toggle();"></toolbarbutton>
+  <toolbarbutton removable="true" id="zen-workspaces-button"></toolbarbutton>
   <toolbarbutton id="zen-profile-button"
     class="zen-sidebar-action-button toolbarbutton-1 chromeclass-toolbar-additional"
     delegatesanchor="true"
@@ -22,4 +25,4 @@
       <image id="zen-profile-button-icon" />
     </vbox>
   </toolbarbutton>
-</toolbar>
+</toolbar>
diff --git a/src/browser/base/content/zen-styles/zen-urlbar.css b/src/browser/base/content/zen-styles/zen-urlbar.css
@@ -125,7 +125,7 @@
 }
 
 :root[zen-single-toolbar='true'] {
-  .urlbar-page-action:not(#star-button-box):not([open]),
+  .urlbar-page-action:not([open]),
   #tracking-protection-icon-container {
     margin-inline-end: calc(-16px - 2 * var(--urlbar-icon-padding)) !important;
     opacity: 0;

diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs
@@ -1056,13 +1056,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
     }
     let button = browser.document.getElementById('zen-workspaces-button');
 
-    if (!button) {
-      button = browser.document.createXULElement('toolbarbutton');
-      button.id = 'zen-workspaces-button';
-      let navbar = browser.document.getElementById('nav-bar');
-      navbar.appendChild(button);
-    }
-
     while (button.firstChild) {
       button.firstChild.remove();
     }