Skip to content

Commit f497072

Browse files
committed
Fix splitter bad position when sidebar is open
1 parent b93c205 commit f497072

5 files changed

Lines changed: 15 additions & 12 deletions

File tree

src/browser/base/content/browser-box-inc-xhtml.patch

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
2-
index d58fcdf99843d110b708f3fbf9fb317787fadfcf..cfc2aad902641609c3804e615c4cb66ce65299b7 100644
2+
index d58fcdf99843d110b708f3fbf9fb317787fadfcf..45ad1e28b31a4993e56dfce0f88f49f48f25f2de 100644
33
--- a/browser/base/content/browser-box.inc.xhtml
44
+++ b/browser/base/content/browser-box.inc.xhtml
55
@@ -3,12 +3,22 @@
@@ -25,16 +25,20 @@ index d58fcdf99843d110b708f3fbf9fb317787fadfcf..cfc2aad902641609c3804e615c4cb66c
2525
<vbox id="sidebar-box" hidden="true" class="chromeclass-extrachrome">
2626
<box id="sidebar-header" align="center">
2727
<toolbarbutton id="sidebar-switcher-target" class="tabbable" aria-expanded="false">
28-
@@ -25,7 +35,7 @@
28+
@@ -25,8 +35,10 @@
2929
</stack>
3030
</vbox>
3131
<splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
3232
- <tabbox id="tabbrowser-tabbox" flex="1" tabcontainer="tabbrowser-tabs">
33+
- <tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0"/>
3334
+#include zen-tabbrowser-elements.inc.xhtml
34-
<tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0"/>
35+
+ <tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0">
36+
+#include ../../../zen/split-view/zen-splitview-overlay.inc.xhtml
37+
+ </tabpanels>
3538
</tabbox>
3639
<splitter id="ai-window-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="none" resizeafter="sibling" collapsed="true"/>
37-
@@ -34,3 +44,5 @@
40+
<vbox id="ai-window-box" collapsed="true" class="chromeclass-extrachrome ai-window-right-sidebar">
41+
@@ -34,3 +46,5 @@
3842
</stack>
3943
</vbox>
4044
</hbox>

src/browser/base/content/zen-tabbrowser-elements.inc.xhtml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,4 @@
44

55
<vbox id="zen-toast-container" />
66

7-
#include ../../../zen/split-view/zen-splitview-overlay.inc.xhtml
87
#include ../../../zen/glance/zen-glance.inc.xhtml

src/zen/common/styles/zen-browser-ui.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ body,
277277
position: absolute;
278278
top: 50%;
279279
left: 50%;
280+
transform: translateX(-50%);
280281
opacity: 0;
281282
transition: opacity 0.1s ease-in-out;
282283
pointer-events: none;

src/zen/split-view/ZenViewSplitter.mjs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1721,7 +1721,7 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
17211721
if (splitNode.direction === "column") {
17221722
splitter.style.inset = `${100 - childRootPosition.bottom}% ${childRootPosition.right}% 0% ${childRootPosition.left}%`;
17231723
} else {
1724-
splitter.style.inset = `${childRootPosition.top}% 0% ${childRootPosition.bottom}% ${100 - childRootPosition.right}%`;
1724+
splitter.style.inset = `${childRootPosition.top}% ${childRootPosition.right}% ${childRootPosition.bottom}% calc(${100 - childRootPosition.right}% - var(--zen-split-row-gap))`;
17251725
}
17261726
}
17271727
});
@@ -1739,7 +1739,7 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
17391739
splitter.className = "zen-split-view-splitter";
17401740
splitter.setAttribute("orient", orient);
17411741
splitter.setAttribute("gridIdx", idx);
1742-
this.overlay.insertAdjacentElement("afterbegin", splitter);
1742+
this.tabBrowserPanel.appendChild(splitter);
17431743

17441744
splitter.addEventListener("mousedown", this.handleSplitterMouseDown);
17451745
return splitter;
@@ -1775,8 +1775,8 @@ class nsZenViewSplitter extends nsZenDOMOperatedFeature {
17751775
}
17761776

17771777
removeSplitters() {
1778-
[...this.overlay.children]
1779-
.filter(c => c.classList.contains("zen-split-view-splitter"))
1778+
this.tabBrowserPanel
1779+
.querySelectorAll(".zen-split-view-splitter")
17801780
.forEach(s => s.remove());
17811781
this._splitNodeToSplitters.clear();
17821782
}

src/zen/split-view/zen-split-view.css

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,6 @@
101101
margin-right: calc(-1 * var(--zen-split-column-gap));
102102
}
103103

104-
:root:not([customizing]) #zen-splitview-overlay {
105-
margin-top: calc(var(--zen-split-column-gap) * -1);
106-
}
107104

108105
#tabbrowser-tabpanels[zen-split-view] {
109106
.zen-split-view-splitter {
@@ -116,6 +113,8 @@
116113
pointer-events: none;
117114
padding: inherit;
118115
inset: 0;
116+
-moz-subtree-hidden-only-visually: 0;
117+
z-index: 2;
119118
}
120119

121120
#zen-splitview-overlay {

0 commit comments

Comments
 (0)