From c8150ccdccf29ea55b0d94e6b23f146a08fc33ef Mon Sep 17 00:00:00 2001 From: Samuel Oldham <77629938+SO9010@users.noreply.github.com> Date: Mon, 12 May 2025 23:26:16 +0100 Subject: [PATCH 1/2] Fix for #7910 This fixes #7910 by adding a conditional check for whether the sidebar is on the right and adjusting the CSS accordingly. Signed-off-by: Samuel Oldham <77629938+SO9010@users.noreply.github.com> --- src/zen/glance/ZenGlanceManager.mjs | 9 +++++++++ src/zen/glance/zen-glance.css | 8 +++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs index 2960ef291..646ddc6ce 100644 --- a/src/zen/glance/ZenGlanceManager.mjs +++ b/src/zen/glance/ZenGlanceManager.mjs @@ -50,6 +50,10 @@ }); } + #areTabsOnRightSide() { + return Services.prefs.getBoolPref('zen.tabs.vertical.right-side'); + } + get #currentBrowser() { return this.#glances.get(this.#currentGlanceID)?.browser; } @@ -124,6 +128,11 @@ showSidebarButtons(animate = false) { if (this.sidebarButtons.hasAttribute('hidden') && animate) { + if (this.#areTabsOnRightSide()) { + this.sidebarButtons.setAttribute('right', true); + } else { + this.sidebarButtons.removeAttribute('right'); + } for (const button of this.sidebarButtons.querySelectorAll('toolbarbutton')) { button.style.opacity = 0; } diff --git a/src/zen/glance/zen-glance.css b/src/zen/glance/zen-glance.css index fddacedc2..ef74d9e85 100644 --- a/src/zen/glance/zen-glance.css +++ b/src/zen/glance/zen-glance.css @@ -18,7 +18,13 @@ padding: 5px; gap: 12px; - left: 2%; + + &[right='true'] { + right: 2%; + } + &[right='false'] { + left: 2%; + } & toolbarbutton { width: 32px; From 1be8b20b64f83d2776eabcaab5d88ada21a183e4 Mon Sep 17 00:00:00 2001 From: "mr. m" <91018726+mauro-balades@users.noreply.github.com> Date: Tue, 13 May 2025 00:31:17 +0200 Subject: [PATCH 2/2] Make use of lazy preferences Signed-off-by: mr. m <91018726+mauro-balades@users.noreply.github.com> --- src/zen/glance/ZenGlanceManager.mjs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs index 646ddc6ce..8af15933a 100644 --- a/src/zen/glance/ZenGlanceManager.mjs +++ b/src/zen/glance/ZenGlanceManager.mjs @@ -50,10 +50,6 @@ }); } - #areTabsOnRightSide() { - return Services.prefs.getBoolPref('zen.tabs.vertical.right-side'); - } - get #currentBrowser() { return this.#glances.get(this.#currentGlanceID)?.browser; } @@ -128,7 +124,7 @@ showSidebarButtons(animate = false) { if (this.sidebarButtons.hasAttribute('hidden') && animate) { - if (this.#areTabsOnRightSide()) { + if (gZenVerticalTabsManager._prefsRightSide) { this.sidebarButtons.setAttribute('right', true); } else { this.sidebarButtons.removeAttribute('right');