From 855c36280ba34c34b97fbabef6f1af1fc8f527ff Mon Sep 17 00:00:00 2001 From: "mr. M" Date: Thu, 13 Feb 2025 19:36:00 +0100 Subject: [PATCH] Refactor tab overflow detection and adjust workspace initialization logic --- src/browser/base/content/ZenStartup.mjs | 4 ++-- src/browser/base/zen-components/ZenWorkspaces.mjs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/browser/base/content/ZenStartup.mjs b/src/browser/base/content/ZenStartup.mjs index a09e51f47..e25539c50 100644 --- a/src/browser/base/content/ZenStartup.mjs +++ b/src/browser/base/content/ZenStartup.mjs @@ -94,8 +94,8 @@ // Detect overflow and underflow const observer = new ResizeObserver((_) => { const tabContainer = gBrowser.tabContainer; - const isVertical = tabContainer.getAttribute('orient') === 'vertical'; - let contentSize = tabsWrapper.getBoundingClientRect()[isVertical ? 'height' : 'width']; + // const isVertical = tabContainer.getAttribute('orient') === 'vertical'; + // let contentSize = tabsWrapper.getBoundingClientRect()[isVertical ? 'height' : 'width']; // NOTE: This should be contentSize > scrollClientSize, but due // to how Gecko internally rounds in those cases, we allow for some // minor differences (the internal Gecko layout size is 1/60th of a diff --git a/src/browser/base/zen-components/ZenWorkspaces.mjs b/src/browser/base/zen-components/ZenWorkspaces.mjs index e622626b8..072f7494b 100644 --- a/src/browser/base/zen-components/ZenWorkspaces.mjs +++ b/src/browser/base/zen-components/ZenWorkspaces.mjs @@ -526,7 +526,6 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature { this.activeWorkspace = activeWorkspace?.uuid; } } - await this.initializeTabsStripSections(); try { if (activeWorkspace) { window.gZenThemePicker = new ZenThemePicker(); @@ -535,6 +534,7 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature { } catch (e) { console.error('ZenWorkspaces: Error initializing theme picker', e); } + await this.initializeTabsStripSections(); } }