mirror of
https://github.com/zen-browser/desktop.git
synced 2025-07-08 14:09:58 +02:00
fix: Fixed tabs appearing where pinned tabs are when splitting views, b=no-bug, c=workspaces
This commit is contained in:
parent
d1fffc59cf
commit
7f28047f82
2 changed files with 3 additions and 3 deletions
|
@ -1,5 +1,5 @@
|
||||||
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
|
diff --git a/browser/components/tabbrowser/content/tabbrowser.js b/browser/components/tabbrowser/content/tabbrowser.js
|
||||||
index d5aa64842a35c6697263c63fd3a0571b64b01344..48d8465f1a4d593ec6d4bff2bd7a83f44116506b 100644
|
index d5aa64842a35c6697263c63fd3a0571b64b01344..e8f37acf7761adb7bd97cb06dc1df386ffc8ec0b 100644
|
||||||
--- a/browser/components/tabbrowser/content/tabbrowser.js
|
--- a/browser/components/tabbrowser/content/tabbrowser.js
|
||||||
+++ b/browser/components/tabbrowser/content/tabbrowser.js
|
+++ b/browser/components/tabbrowser/content/tabbrowser.js
|
||||||
@@ -413,11 +413,41 @@
|
@@ -413,11 +413,41 @@
|
||||||
|
@ -9,7 +9,7 @@ index d5aa64842a35c6697263c63fd3a0571b64b01344..48d8465f1a4d593ec6d4bff2bd7a83f4
|
||||||
+ get _numVisiblePinTabsWithoutCollapsed() {
|
+ get _numVisiblePinTabsWithoutCollapsed() {
|
||||||
+ let i = 0;
|
+ let i = 0;
|
||||||
+ for (let item of this.tabContainer.ariaFocusableItems) {
|
+ for (let item of this.tabContainer.ariaFocusableItems) {
|
||||||
+ if (this.isTabGroupLabel(item) && item.closest("zen-group")?.pinned) {
|
+ if (this.isTabGroupLabel(item) && item.closest("tab-group")?.pinned) {
|
||||||
+ i += 1;
|
+ i += 1;
|
||||||
+ continue;
|
+ continue;
|
||||||
+ }
|
+ }
|
||||||
|
|
|
@ -889,7 +889,6 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error('gZenWorkspaces: Error initializing theme picker', e);
|
console.error('gZenWorkspaces: Error initializing theme picker', e);
|
||||||
}
|
}
|
||||||
this.onWindowResize();
|
|
||||||
await gZenSessionStore.promiseInitialized;
|
await gZenSessionStore.promiseInitialized;
|
||||||
await this.workspaceBookmarks();
|
await this.workspaceBookmarks();
|
||||||
await this.initializeTabsStripSections();
|
await this.initializeTabsStripSections();
|
||||||
|
@ -897,6 +896,7 @@ var gZenWorkspaces = new (class extends ZenMultiWindowFeature {
|
||||||
await gZenPinnedTabManager.refreshPinnedTabs({ init: true });
|
await gZenPinnedTabManager.refreshPinnedTabs({ init: true });
|
||||||
await this.changeWorkspace(activeWorkspace, { onInit: true });
|
await this.changeWorkspace(activeWorkspace, { onInit: true });
|
||||||
this._fixTabPositions();
|
this._fixTabPositions();
|
||||||
|
this.onWindowResize();
|
||||||
this._resolveInitialized();
|
this._resolveInitialized();
|
||||||
this._clearAnyZombieTabs(); // Dont call with await
|
this._clearAnyZombieTabs(); // Dont call with await
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue