ZenBrowserMirrors/components
1
0
Fork 0
mirror of https://github.com/zen-browser/components.git synced 2025-07-08 16:40:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix split/unsplit logic

Browse source
This commit is contained in:
brahim 2024-10-04 17:20:49 +02:00
parent 39b876f701
commit d046938e41
1 changed files with 10 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/ZenViewSplitter.mjs
View file

@ -477,7 +477,11 @@ var gZenViewSplitter = new class {
if (existingSplitTab) { if (existingSplitTab) {
const groupIndex = this._data.findIndex((group) => group.tabs.includes(existingSplitTab)); const groupIndex = this._data.findIndex((group) => group.tabs.includes(existingSplitTab));
const group = this._data[groupIndex]; const group = this._data[groupIndex];
if (group.gridType === gridType) { if (group.gridType !== gridType || tabs.length !== tabs.length) {
// reset layout
group.gridType = gridType;
group.layoutTree = this.calculateLayoutTree([...new Set(group.tabs.concat(tabs))], gridType);
} else {
// Add any tabs that are not already in the group // Add any tabs that are not already in the group
for (const tab of tabs) { for (const tab of tabs) {
if (!group.tabs.includes(tab)) { if (!group.tabs.includes(tab)) {
@ -485,11 +489,8 @@ var gZenViewSplitter = new class {
this.addTabToSplit(tab, group.layoutTree); this.addTabToSplit(tab, group.layoutTree);
} }
} }
} else {
group.gridType = gridType;
group.layoutTree = this.calculateLayoutTree(tabs, gridType);
} }
this.activateSplitView(group); this.activateSplitView(group, true);
return; return;
} }
@ -544,6 +545,7 @@ var gZenViewSplitter = new class {
this.removeSplitters(); this.removeSplitters();
this.tabBrowserPanel.removeAttribute('zen-split-view'); this.tabBrowserPanel.removeAttribute('zen-split-view');
this.setTabsDocShellState(this._data[this.currentView].tabs, false); this.setTabsDocShellState(this._data[this.currentView].tabs, false);
this.updateSplitViewButton(true);
this.currentView = -1; this.currentView = -1;
} }
@ -574,10 +576,10 @@ var gZenViewSplitter = new class {
calculateLayoutTree(tabs, gridType) { calculateLayoutTree(tabs, gridType) {
let rootNode; let rootNode;
if (gridType === 'vsep') { if (gridType === 'vsep' || (tabs.length === 2 && gridType === 'grid')) {
rootNode = new SplitNode('row'); rootNode = new SplitNode('row');
rootNode.children = tabs.map(tab => new SplitLeafNode(tab, 100 / tabs.length, 100)); rootNode.children = tabs.map(tab => new SplitLeafNode(tab, 100 / tabs.length, 100));
} else if (gridType === 'hsep' || (tabs.length === 2 && gridType === 'grid')) { } else if (gridType === 'hsep') {
rootNode = new SplitNode('column'); rootNode = new SplitNode('column');
rootNode.children = tabs.map(tab => new SplitLeafNode(tab, 100, 100 / tabs.length)); rootNode.children = tabs.map(tab => new SplitLeafNode(tab, 100, 100 / tabs.length));
} else if (gridType === 'grid') { } else if (gridType === 'grid') {
@ -696,7 +698,7 @@ var gZenViewSplitter = new class {
} }
removeSplitters() { removeSplitters() {
Array.from(this._splitNodeToSplitters.values()).flatMap(v => v).forEach(e => e.remove()); [...this.splitterBox.children].forEach(s => s.remove());
this._splitNodeToSplitters.clear(); this._splitNodeToSplitters.clear();
} }