From a9538e039f74cdb4d734fa501518e6767b4a566d Mon Sep 17 00:00:00 2001
From: Samuel Oldham <so9010sami@gmail.com>
Date: Sat, 13 Sep 2025 12:36:20 +0100
Subject: [PATCH 1/3] Fixed sidebar split screen error. Fix #6972

---
 .../base/content/browser-box-inc-xhtml.patch   | 11 +++++------
 src/zen/common/ZenStartup.mjs                  |  2 +-
 src/zen/common/styles/zen-sidebar.css          | 18 ++++++++----------
 3 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/browser/base/content/browser-box-inc-xhtml.patch b/src/browser/base/content/browser-box-inc-xhtml.patch
index 7dfb9ea6ff..448a27c071 100644
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,16 +1,14 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index afa7f8e7dd74173bf2c696bd96f7e86e8b0126bc..4847c24923f673e91eb7fb65ea6b037f38062405 100644
+index 4847c24923f673e91eb7fb65ea6b037f38062405..4847c24923f673e91eb7fb65ea6b037f38062405 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
-@@ -25,7 +25,15 @@
+@@ -25,7 +25,13 @@
      </stack>
    </vbox>
    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
 +<vbox flex="1" id="zen-appcontent-wrapper">
-+  <html:div id="zen-appcontent-navbar-wrapper">
-+    <html:div id="zen-appcontent-navbar-container"></html:div>
-+  </html:div>
-+  <hbox id="zen-tabbox-wrapper" flex="1">
++  <html:div id="zen-appcontent-navbar-container"></html:div>
++  <hbox id="zen-tabbox-wrapper" flex="1" tabcontainer="tabbrowser-tabs">
    <tabbox id="tabbrowser-tabbox" flex="1" tabcontainer="tabbrowser-tabs">
 +#include zen-tabbrowser-elements.inc.xhtml
      <tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0"/>
@@ -18,3 +16,4 @@ index afa7f8e7dd74173bf2c696bd96f7e86e8b0126bc..4847c24923f673e91eb7fb65ea6b037f
  </hbox>
 +</vbox>
 +</hbox>
+
diff --git a/src/zen/common/ZenStartup.mjs b/src/zen/common/ZenStartup.mjs
index 6bfdbd62d2..dfa1844df5 100644
--- a/src/zen/common/ZenStartup.mjs
+++ b/src/zen/common/ZenStartup.mjs
@@ -144,7 +144,7 @@
       const browser = document.getElementById('browser');
       browser.prepend(gNavToolbox);
 
-      const sidebarPanelWrapper = document.getElementById('tabbrowser-tabbox');
+      const sidebarPanelWrapper = document.getElementById('zen-tabbox-wrapper');
       for (let id of kElementsToAppend) {
         const elem = document.getElementById(id);
         if (elem) {
diff --git a/src/zen/common/styles/zen-sidebar.css b/src/zen/common/styles/zen-sidebar.css
index d5211dbb0e..a856fddbae 100644
--- a/src/zen/common/styles/zen-sidebar.css
+++ b/src/zen/common/styles/zen-sidebar.css
@@ -8,7 +8,7 @@
 #zen-tabbox-wrapper {
   & #sidebar-splitter {
     opacity: 0;
-    margin: 0 calc(-1 * var(--zen-element-separation) + 2px);
+    margin: 0 calc(-1 * var(--zen-element-separation) + 8px);
   }
 
   & #sidebar-box {
@@ -17,22 +17,20 @@
     overflow: hidden;
 
     :root:not([zen-right-side='true']) &[positionend='true'] {
-      margin-right: var(--zen-element-separation);
+      margin-right: 0;
     }
 
     :root[zen-right-side='true'] & {
-      margin-left: var(--zen-element-separation);
+      margin-left: 0;
     }
   }
 
-  & #tabbrowser-tabbox[sidebar-positionend] {
-    & #sidebar-box {
-      order: 8 !important;
-    }
+  & #sidebar-box[sidebar-positionend] {
+    order: 8 !important;
+  }
 
-    & #sidebar-splitter {
-      order: 7 !important;
-    }
+  #sidebar-box[sidebar-positionend] + #sidebar-splitter {
+    order: 7 !important;
   }
 }
 

From c322e53a749928ebf6c847853bbac13820c49f5f Mon Sep 17 00:00:00 2001
From: Samuel Oldham <so9010sami@gmail.com>
Date: Sun, 14 Sep 2025 14:09:35 +0100
Subject: [PATCH 2/3] Re-add zen-appcontent-navbar-wrapper

---
 src/browser/base/content/browser-box-inc-xhtml.patch | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/browser/base/content/browser-box-inc-xhtml.patch b/src/browser/base/content/browser-box-inc-xhtml.patch
index 448a27c071..3d4f57efb2 100644
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -1,13 +1,15 @@
 diff --git a/browser/base/content/browser-box.inc.xhtml b/browser/base/content/browser-box.inc.xhtml
-index 4847c24923f673e91eb7fb65ea6b037f38062405..4847c24923f673e91eb7fb65ea6b037f38062405 100644
+index afa7f8e7dd..68aa587863 100644
 --- a/browser/base/content/browser-box.inc.xhtml
 +++ b/browser/base/content/browser-box.inc.xhtml
-@@ -25,7 +25,13 @@
+@@ -25,7 +25,15 @@
      </stack>
    </vbox>
    <splitter id="sidebar-splitter" class="chromeclass-extrachrome sidebar-splitter" resizebefore="sibling" resizeafter="none" hidden="true"/>
 +<vbox flex="1" id="zen-appcontent-wrapper">
-+  <html:div id="zen-appcontent-navbar-container"></html:div>
++  <html:div id="zen-appcontent-navbar-wrapper">
++    <html:div id="zen-appcontent-navbar-container"></html:div>
++  </html:div>
 +  <hbox id="zen-tabbox-wrapper" flex="1" tabcontainer="tabbrowser-tabs">
    <tabbox id="tabbrowser-tabbox" flex="1" tabcontainer="tabbrowser-tabs">
 +#include zen-tabbrowser-elements.inc.xhtml
@@ -16,4 +18,3 @@ index 4847c24923f673e91eb7fb65ea6b037f38062405..4847c24923f673e91eb7fb65ea6b037f
  </hbox>
 +</vbox>
 +</hbox>
-

From fdaaac4c01bf71fd3d1d3b92031360b8e954c9c6 Mon Sep 17 00:00:00 2001
From: Samuel Oldham <so9010sami@gmail.com>
Date: Thu, 18 Sep 2025 16:00:35 +0100
Subject: [PATCH 3/3] Remove unnecessary tabcontainer="tabbrowser-tabs"

---
 src/browser/base/content/browser-box-inc-xhtml.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/browser/base/content/browser-box-inc-xhtml.patch b/src/browser/base/content/browser-box-inc-xhtml.patch
index 3d4f57efb2..9c8dbcb9ff 100644
--- a/src/browser/base/content/browser-box-inc-xhtml.patch
+++ b/src/browser/base/content/browser-box-inc-xhtml.patch
@@ -10,7 +10,7 @@ index afa7f8e7dd..68aa587863 100644
 +  <html:div id="zen-appcontent-navbar-wrapper">
 +    <html:div id="zen-appcontent-navbar-container"></html:div>
 +  </html:div>
-+  <hbox id="zen-tabbox-wrapper" flex="1" tabcontainer="tabbrowser-tabs">
++  <hbox id="zen-tabbox-wrapper" flex="1">
    <tabbox id="tabbrowser-tabbox" flex="1" tabcontainer="tabbrowser-tabs">
 +#include zen-tabbrowser-elements.inc.xhtml
      <tabpanels id="tabbrowser-tabpanels" flex="1" selectedIndex="0"/>