mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2026-02-06 20:07:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: Make sure we properly restore split views when only pinned sync is enabled, b=no-bug, c=no-component

Browse Source
This commit is contained in:
mr. m
2026-02-05 23:01:49 +01:00
parent 1ea5d2fa6f
commit e6154ceb99
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/zen/sessionstore/ZenSessionManager.sys.mjs
View File

@@ -570,13 +570,21 @@ export class nsZenSessionManager {
let pinnedTabs = (sidebar.tabs || []).filter((tab) => tab.pinned);
let unpinedWindowTabs = (aWindowData.tabs || []).filter((tab) => !tab.pinned);
aWindowData.tabs = [...pinnedTabs, ...unpinedWindowTabs];
// We restore ALL the split view data in the sidebar, if the group doesn't exist in the window,
// it should be a no-op anyways.
aWindowData.splitViewData = [...sidebar.splitViewData, ...aWindowData.splitViewData];
// Same thing with groups, we restore all the groups from the sidebar, if they don't have any
// existing tabs in the window, they should be a no-op.
aWindowData.groups = [...sidebar.groups, ...aWindowData.groups];
} else {
aWindowData.tabs = sidebar.tabs || [];
aWindowData.splitViewData = sidebar.splitViewData;
aWindowData.groups = sidebar.groups;
}
aWindowData.splitViewData = sidebar.splitViewData;
// Folders are always pinned, so we dont need to check for the pinned state here.
aWindowData.folders = sidebar.folders;
aWindowData.groups = sidebar.groups;
aWindowData.spaces = sidebar.spaces;
}
@@ -613,6 +621,7 @@ export class nsZenSessionManager {
if (!lazy.gWindowSyncEnabled || lazy.gSyncOnlyPinnedTabs) {
// Don't bring over any unpinned tabs if window sync is disabled or if syncing only pinned tabs.
newWindow.tabs = newWindow.tabs.filter((tab) => tab.pinned);
newWindow.groups = newWindow.groups?.filter((group) => group.pinned);
}
// These are window-specific from the previous window state that