LeMoonStar/zen-realigned
1
0
Fork 0
forked from ZenBrowserMirrors/zen-desktop
Code Pull requests Activity

chore: Started working on browser swaping, b=(no-bug), c=workspaces

Browse source
This commit is contained in:
mr. m 2025-04-30 19:06:12 +02:00
parent 7fe7e898af
commit 0d0967c823
No known key found for this signature in database
GPG key ID: 419302196C23B258
1 changed files with 66 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

82
src/zen/workspaces/ZenWorkspaces.mjs
View file

@ -2930,6 +2930,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
#ignoreNextEvents = false; #ignoreNextEvents = false;
#waitForPromise = null; #waitForPromise = null;
lastSelectedWindow = false;
constructor() { constructor() {
super(); super();
if (!window.closed) { if (!window.closed) {
@ -2941,6 +2943,8 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
await ZenWorkspaces.promiseInitialized; await ZenWorkspaces.promiseInitialized;
this.#makeSureAllTabsHaveIds(); this.#makeSureAllTabsHaveIds();
this.#setUpEventListeners(); this.#setUpEventListeners();
this.lastSelectedWindow = ZenMultiWindowFeature.isActiveWindow;
} }
#makeSureAllTabsHaveIds() { #makeSureAllTabsHaveIds() {
@ -2971,12 +2975,60 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
for (const event of kEvents) { for (const event of kEvents) {
window.addEventListener(event, eventListener); window.addEventListener(event, eventListener);
} }
window.addEventListener('unload', () => {
for (const event of kEvents) {
window.removeEventListener(event, eventListener);
}
});
window.addEventListener('focus', this.#onWindowFocus.bind(this));
} }
#handleEvent(event) { #handleEvent(event) {
this.#propagateToOtherWindows(event); this.#propagateToOtherWindows(event);
} }
#getLastSelectedWindow() {
return new Promise(async (resolve) => {
await this.foreachWindowAsActive(async (browser) => {
if (browser.gZenWorkspaceWindowSync && browser.gZenWorkspaceWindowSync.lastSelectedWindow) {
resolve(browser);
}
});
resolve(null);
});
}
async #onWindowFocus(event) {
const lastSelectedWindow = await this.#getLastSelectedWindow();
if (lastSelectedWindow && lastSelectedWindow !== window) {
lastSelectedWindow.gZenWorkspaceWindowSync.lastSelectedWindow = false;
this.lastSelectedWindow = true;
this.#replaceBrowsersWithLastSelectedWindow(lastSelectedWindow);
} else {
this.lastSelectedWindow = false;
}
}
#replaceBrowsersWithLastSelectedWindow(lastSelectedWindow) {
// Replace all `linkedBrowser` elements with the last selected window's browsers
// from all the tabs in the current window
const allTabs = lastSelectedWindow.ZenWorkspaces.allStoredTabs;
for (const oldTab of allTabs) {
const tabId = this.#getTabId(oldTab);
const targetTab = this.#getTabWithId(tabId);
if (targetTab) {
const browserToReplace = oldTab.linkedBrowser;
const browserReplaced = targetTab.linkedBrowser;
const parentNode = browserReplaced.parentNode;
if (browserToReplace && parentNode) {
gBrowser.swapBrowsers(browserToReplace, browserReplaced);
}
}
}
}
async #propagateToOtherWindows(event) { async #propagateToOtherWindows(event) {
if (this.#ignoreNextEvents) { if (this.#ignoreNextEvents) {
return; return;
@ -3148,22 +3200,20 @@ var ZenWorkspaces = new (class extends ZenMultiWindowFeature {
async #onTabOpen(event) { async #onTabOpen(event) {
await new Promise((resolve) => { await new Promise((resolve) => {
setTimeout(() => { const targetTab = event.target;
const targetTab = event.target; const isPinned = targetTab.pinned;
const isPinned = targetTab.pinned; const isEssential = isPinned && targetTab.hasAttribute('zen-essential');
const isEssential = isPinned && targetTab.hasAttribute('zen-essential'); const tabIndex = targetTab._tPos;
const tabIndex = targetTab._tPos;
const duplicatedTab = SessionStore.duplicateTab(window, targetTab, 0, true);
const duplicatedTab = SessionStore.duplicateTab(window, targetTab, 0, true); if (isEssential) {
if (isEssential) { gZenPinnedTabManager.addToEssentials(duplicatedTab);
gZenPinnedTabManager.addToEssentials(duplicatedTab); } else if (isPinned) {
} else if (isPinned) { gBrowser.pinTab(duplicatedTab);
gBrowser.pinTab(duplicatedTab); }
}
gBrowser.moveTabTo(duplicatedTab, { tabIndex, forceUngrouped: !!targetTab.group });
gBrowser.moveTabTo(duplicatedTab, { tabIndex, forceUngrouped: !!targetTab.group }); resolve();
resolve();
}, 0);
}); });
} }
} }