Skip to content

Commit 7f28047

Browse files
committed
fix: Fixed tabs appearing where pinned tabs are when splitting views, b=no-bug, c=workspaces
1 parent d1fffc5 commit 7f28047

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/browser/components/tabbrowser/content/tabbrowser-js.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
2-
index d5aa64842a35c6697263c63fd3a0571b64b01344..48d8465f1a4d593ec6d4bff2bd7a83f44116506b 100644
2+
index d5aa64842a35c6697263c63fd3a0571b64b01344..e8f37acf7761adb7bd97cb06dc1df386ffc8ec0b 100644
33
--- a/browser/components/tabbrowser/content/tabbrowser.js
44
+++ b/browser/components/tabbrowser/content/tabbrowser.js
55
@@ -413,11 +413,41 @@
@@ -9,7 +9,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..48d8465f1a4d593ec6d4bff2bd7a83f4
99
+ get _numVisiblePinTabsWithoutCollapsed() {
1010
+ let i = 0;
1111
+ for (let item of this.tabContainer.ariaFocusableItems) {
12-
+ if (this.isTabGroupLabel(item) && item.closest("zen-group")?.pinned) {
12+
+ if (this.isTabGroupLabel(item) && item.closest("tab-group")?.pinned) {
1313
+ i += 1;
1414
+ continue;
1515
+ }

src/zen/workspaces/ZenWorkspaces.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -889,14 +889,14 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
889889
} catch (e) {
890890
console.error('gZenWorkspaces: Error initializing theme picker', e);
891891
}
892-
this.onWindowResize();
893892
await gZenSessionStore.promiseInitialized;
894893
await this.workspaceBookmarks();
895894
await this.initializeTabsStripSections();
896895
this._initializeEmptyTab();
897896
await gZenPinnedTabManager.refreshPinnedTabs({ init: true });
898897
await this.changeWorkspace(activeWorkspace, { onInit: true });
899898
this._fixTabPositions();
899+
this.onWindowResize();
900900
this._resolveInitialized();
901901
this._clearAnyZombieTabs(); // Dont call with await
902902

0 commit comments

Comments
 (0)