From e9bbbaf446417ce9cca8373cf6760061ffc5cddd Mon Sep 17 00:00:00 2001 From: "Mr. M" Date: Wed, 11 Jun 2025 03:32:32 +0200 Subject: [PATCH] fix: Fixed opening glance from a split view making tabs unaccessible, b=no-bug, c=glance, split-view --- src/zen/glance/ZenGlanceManager.mjs | 2 +- src/zen/split-view/ZenViewSplitter.mjs | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/zen/glance/ZenGlanceManager.mjs b/src/zen/glance/ZenGlanceManager.mjs index e59e926e8..aac97ddcd 100644 --- a/src/zen/glance/ZenGlanceManager.mjs +++ b/src/zen/glance/ZenGlanceManager.mjs @@ -664,7 +664,7 @@ type: 'spring', } ); - gZenViewSplitter.deactivateCurrentSplitView(); + gZenViewSplitter.deactivateCurrentSplitView({ removeDeckSelected: true }); this.finishOpeningGlance(); } diff --git a/src/zen/split-view/ZenViewSplitter.mjs b/src/zen/split-view/ZenViewSplitter.mjs index c67b4fa71..26285cb14 100644 --- a/src/zen/split-view/ZenViewSplitter.mjs +++ b/src/zen/split-view/ZenViewSplitter.mjs @@ -1142,12 +1142,12 @@ class ZenViewSplitter extends ZenDOMOperatedFeature { /** * Deactivates the split view. */ - deactivateCurrentSplitView() { + deactivateCurrentSplitView({ removeDeckSelected = false } = {}) { if (this.currentView < 0) return; this.setTabsDocShellState(this._data[this.currentView].tabs, false); for (const tab of this._data[this.currentView].tabs) { const container = tab.linkedBrowser.closest('.browserSidebarContainer'); - this.resetContainerStyle(container); + this.resetContainerStyle(container, removeDeckSelected); } this.removeSplitters(); this.tabBrowserPanel.removeAttribute('zen-split-view'); @@ -1496,10 +1496,14 @@ class ZenViewSplitter extends ZenDOMOperatedFeature { * Resets the container style. * * @param {Element} container - The container element. + * @param {boolean} [removeDeckSelected=false] - Whether to remove the 'deck-selected' attribute. */ - resetContainerStyle(container) { + resetContainerStyle(container, removeDeckSelected = false) { container.removeAttribute('zen-split'); container.style.inset = ''; + if (removeDeckSelected) { + container.classList.remove('deck-selected'); + } } /**