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

Fix splitview can't activate when tab unloaded, autoload tab when activating split.

Browse source
This commit is contained in:
brahim 2024-10-04 15:07:29 +02:00
parent 894d856282
commit 39b876f701
1 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/ZenViewSplitter.mjs
View file

@ -43,8 +43,8 @@ class SplitNode {
} }
} }
class SplitLeafNode { class SplitLeafNode {
constructor(tabContainerId,widthInParent = 100, heightInParent = 100) { constructor(tab, widthInParent = 100, heightInParent = 100) {
this.id = tabContainerId; this.tab = tab;
this.widthInParent = widthInParent; this.widthInParent = widthInParent;
this.heightInParent = heightInParent; this.heightInParent = heightInParent;
} }
@ -59,7 +59,7 @@ var gZenViewSplitter = new class {
this.canChangeTabOnHover = null; this.canChangeTabOnHover = null;
this.splitterBox = null; this.splitterBox = null;
this._splitNodeToSplitters = new Map(); this._splitNodeToSplitters = new Map();
this._containerToSplitNode = new Map(); this._tabToSplitNode = new Map();
XPCOMUtils.defineLazyPreferenceGetter( XPCOMUtils.defineLazyPreferenceGetter(
this, this,
@ -129,7 +129,7 @@ var gZenViewSplitter = new class {
if (group.tabs.length < 2) { if (group.tabs.length < 2) {
this.removeGroup(groupIndex); this.removeGroup(groupIndex);
} else { } else {
const node = this._containerToSplitNode.get(tab.linkedBrowser.closest('.browserSidebarContainer')) const node = this._tabToSplitNode.get(tab);
this.applyRemoveNode(node); this.applyRemoveNode(node);
} }
} }
@ -504,15 +504,14 @@ var gZenViewSplitter = new class {
} }
addTabToSplit(tab, splitNode) { addTabToSplit(tab, splitNode) {
const tabContainer = tab.linkedBrowser.closest('.browserSidebarContainer');
if (splitNode.direction === 'row') { if (splitNode.direction === 'row') {
const reduce = splitNode.children.length / (splitNode.children.length + 1); const reduce = splitNode.children.length / (splitNode.children.length + 1);
splitNode.children.forEach(c => c.widthInParent *= reduce); splitNode.children.forEach(c => c.widthInParent *= reduce);
splitNode.addChild(new SplitLeafNode(tabContainer.id, (1 - reduce) * 100, 100)); splitNode.addChild(new SplitLeafNode(tab, (1 - reduce) * 100, 100));
} else if (splitNode.direction === 'column') { } else if (splitNode.direction === 'column') {
const reduce = splitNode.children.length / (splitNode.children.length + 1); const reduce = splitNode.children.length / (splitNode.children.length + 1);
splitNode.children.forEach(c => c.heightInParent *= reduce); splitNode.children.forEach(c => c.heightInParent *= reduce);
splitNode.addChild(new SplitLeafNode(tabContainer.id, (1 - reduce) * 100, 100)); splitNode.addChild(new SplitLeafNode(tab, (1 - reduce) * 100, 100));
} }
} }
@ -559,6 +558,11 @@ var gZenViewSplitter = new class {
if (oldView >= 0 && oldView !== newView) this.deactivateCurrentSplitView(); if (oldView >= 0 && oldView !== newView) this.deactivateCurrentSplitView();
this.currentView = newView; this.currentView = newView;
if (reset) this.removeSplitters(); if (reset) this.removeSplitters();
splitData.tabs.forEach((tab) => {
if (tab.hasAttribute('pending')) {
gBrowser.getBrowserForTab(tab).reload();
}
});
this.tabBrowserPanel.setAttribute('zen-split-view', 'true'); this.tabBrowserPanel.setAttribute('zen-split-view', 'true');
@ -569,24 +573,23 @@ var gZenViewSplitter = new class {
} }
calculateLayoutTree(tabs, gridType) { calculateLayoutTree(tabs, gridType) {
const containerIds = tabs.map(t => t.linkedBrowser.closest('.browserSidebarContainer').id);
let rootNode; let rootNode;
if (gridType === 'vsep') { if (gridType === 'vsep') {
rootNode = new SplitNode('row'); rootNode = new SplitNode('row');
rootNode.children = containerIds.map(id => new SplitLeafNode(id, 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' || (tabs.length === 2 && gridType === 'grid')) {
rootNode = new SplitNode('column'); rootNode = new SplitNode('column');
rootNode.children = containerIds.map(id => new SplitLeafNode(id, 100, 100 / tabs.length)); rootNode.children = tabs.map(tab => new SplitLeafNode(tab, 100, 100 / tabs.length));
} else if (gridType === 'grid') { } else if (gridType === 'grid') {
rootNode = new SplitNode('row'); rootNode = new SplitNode('row');
const rowWidth = 100 / Math.ceil(tabs.length / 2); const rowWidth = 100 / Math.ceil(tabs.length / 2);
for (let i = 0; i < tabs.length - 1; i += 2) { for (let i = 0; i < tabs.length - 1; i += 2) {
const columnNode = new SplitNode('column', rowWidth, 100); const columnNode = new SplitNode('column', rowWidth, 100);
columnNode.children = [new SplitLeafNode(containerIds[i], 100, 50), new SplitLeafNode(containerIds[i + 1], 100, 50)]; columnNode.children = [new SplitLeafNode(tabs[i], 100, 50), new SplitLeafNode(tabs[i + 1], 100, 50)];
rootNode.addChild(columnNode); rootNode.addChild(columnNode);
} }
if (tabs.length % 2 !== 0) { if (tabs.length % 2 !== 0) {
rootNode.addChild(new SplitLeafNode(containerIds[tabs.length - 1], rowWidth, 100)); rootNode.addChild(new SplitLeafNode(tabs[tabs.length - 1], rowWidth, 100));
} }
} }
@ -618,9 +621,9 @@ var gZenViewSplitter = new class {
} }
const nodeRootPosition = splitNode.positionToRoot; const nodeRootPosition = splitNode.positionToRoot;
if (!splitNode.children) { if (!splitNode.children) {
const browserContainer = document.getElementById(splitNode.id); const browserContainer = splitNode.tab.linkedBrowser.closest('.browserSidebarContainer');
browserContainer.style.inset = `${nodeRootPosition.top}% ${nodeRootPosition.right}% ${nodeRootPosition.bottom}% ${nodeRootPosition.left}%`; browserContainer.style.inset = `${nodeRootPosition.top}% ${nodeRootPosition.right}% ${nodeRootPosition.bottom}% ${nodeRootPosition.left}%`;
this._containerToSplitNode.set(browserContainer, splitNode); this._tabToSplitNode.set(splitNode.tab, splitNode);
return; return;
} }