Skip to content

Commit ef22f08

Browse files
committed
Merge branch 'dev' of https://github.com/zen-browser/desktop into dev
2 parents e8c43f5 + e9bbbaf commit ef22f08

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

src/zen/glance/ZenGlanceManager.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@
664664
type: 'spring',
665665
}
666666
);
667-
gZenViewSplitter.deactivateCurrentSplitView();
667+
gZenViewSplitter.deactivateCurrentSplitView({ removeDeckSelected: true });
668668
this.finishOpeningGlance();
669669
}
670670

src/zen/split-view/ZenViewSplitter.mjs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,12 +1142,12 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
11421142
/**
11431143
* Deactivates the split view.
11441144
*/
1145-
deactivateCurrentSplitView() {
1145+
deactivateCurrentSplitView({ removeDeckSelected = false } = {}) {
11461146
if (this.currentView < 0) return;
11471147
this.setTabsDocShellState(this._data[this.currentView].tabs, false);
11481148
for (const tab of this._data[this.currentView].tabs) {
11491149
const container = tab.linkedBrowser.closest('.browserSidebarContainer');
1150-
this.resetContainerStyle(container);
1150+
this.resetContainerStyle(container, removeDeckSelected);
11511151
}
11521152
this.removeSplitters();
11531153
this.tabBrowserPanel.removeAttribute('zen-split-view');
@@ -1496,10 +1496,14 @@ class ZenViewSplitter extends ZenDOMOperatedFeature {
14961496
* Resets the container style.
14971497
*
14981498
* @param {Element} container - The container element.
1499+
* @param {boolean} [removeDeckSelected=false] - Whether to remove the 'deck-selected' attribute.
14991500
*/
1500-
resetContainerStyle(container) {
1501+
resetContainerStyle(container, removeDeckSelected = false) {
15011502
container.removeAttribute('zen-split');
15021503
container.style.inset = '';
1504+
if (removeDeckSelected) {
1505+
container.classList.remove('deck-selected');
1506+
}
15031507
}
15041508

15051509
/**

0 commit comments

Comments
 (0)