From ae677e60885e9430abefba63fa6e24ea2843c4bb Mon Sep 17 00:00:00 2001
From: Mauro Balades <mauro.balades@tutanota.com>
Date: Mon, 29 Apr 2024 20:19:56 +0200
Subject: [PATCH] Updated to firefox 125.0.3!

---
 gluon.json                                             |  2 +-
 src/browser/base/content/ZenSidebarManager.mjs         |  3 ++-
 .../base/content/navigator-toolbox-inc-xhtml.patch     | 10 ++++++----
 src/browser/themes/shared/zen-browser-shared.css       |  4 ++--
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/gluon.json b/gluon.json
index 42e030eaf..cf5895346 100644
--- a/gluon.json
+++ b/gluon.json
@@ -5,7 +5,7 @@
   "binaryName": "zen",
   "version": {
     "product": "firefox",
-    "version": "125.0.2",
+    "version": "125.0.3",
     "displayVersion": "1.0.0"
   },
   "buildOptions": {
diff --git a/src/browser/base/content/ZenSidebarManager.mjs b/src/browser/base/content/ZenSidebarManager.mjs
index fd8425827..45457b841 100644
--- a/src/browser/base/content/ZenSidebarManager.mjs
+++ b/src/browser/base/content/ZenSidebarManager.mjs
@@ -143,7 +143,8 @@ var gZenBrowserManagerSidebar = {
 
   _updateArrowScrollMaxHeight(num) {
     let content = document.querySelector("#tabbrowser-arrowscrollbox");
-    let height = (this.MAX_SIDEBAR_PANELS * 140) - (num * 120);
+    // TODO: make this dynamic with CSS!
+    let height = (this.MAX_SIDEBAR_PANELS * 120) - (num * 120);
     content.style.maxHeight = `${height}px`;
   },
 
diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
index 58bde926f..670c30c8b 100644
--- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
+++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch
@@ -1,5 +1,5 @@
 diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml
-index fc19910726f2925505f6e71add034c82af36b63e..a0830b01feef88bc727edef453f5add123fdfc10 100644
+index fc19910726f2925505f6e71add034c82af36b63e..90a4686992832cad8656f4c9978ff460d20eb053 100644
 --- a/browser/base/content/navigator-toolbox.inc.xhtml
 +++ b/browser/base/content/navigator-toolbox.inc.xhtml
 @@ -32,10 +32,11 @@
@@ -27,7 +27,7 @@ index fc19910726f2925505f6e71add034c82af36b63e..a0830b01feef88bc727edef453f5add1
  # DisplayPortUtils::MaybeCreateDisplayPortInFirstScrollFrameEncountered based
  # the current structure that we may want to revisit.
 -            <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="horizontal" flex="1" style="min-width: 1px;" clicktoscroll="true" scrolledtostart="true" scrolledtoend="true">
-+            <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="vertical" flex="1" style="min-width: 1px;" clicktoscroll="true" scrolledtostart="true" scrolledtoend="true">
++            <arrowscrollbox id="tabbrowser-arrowscrollbox" orient="vertical" style="min-width: 1px;" clicktoscroll="true" scrolledtostart="true" scrolledtoend="true">
                <tab is="tabbrowser-tab" class="tabbrowser-tab" selected="true" visuallyselected="" fadein=""/>
                <hbox id="tabbrowser-arrowscrollbox-periphery">
                  <toolbartabstop/>
@@ -41,17 +41,19 @@ index fc19910726f2925505f6e71add034c82af36b63e..a0830b01feef88bc727edef453f5add1
                  <spacer class="closing-tabs-spacer" style="width: 0;"/>
                </hbox>
              </arrowscrollbox>
-@@ -101,7 +105,10 @@
+@@ -101,8 +105,11 @@
          <label data-l10n-id="private-browsing-indicator-label"></label>
        </hbox>
  
 +#if 0
  #include titlebar-items.inc.xhtml
+-
 +#endif
 +#include zen-sidebar-icons.inc.xhtml
- 
++    
      </toolbar>
  
+   </vbox>
 @@ -447,6 +454,7 @@
  
        <toolbarbutton id="fxa-toolbar-menu-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
diff --git a/src/browser/themes/shared/zen-browser-shared.css b/src/browser/themes/shared/zen-browser-shared.css
index ed47af788..c2c6a51ef 100644
--- a/src/browser/themes/shared/zen-browser-shared.css
+++ b/src/browser/themes/shared/zen-browser-shared.css
@@ -378,11 +378,11 @@ toolbarbutton#scrollbutton-up {
   margin-inline-end: 0 !important;
 }
 
-#tabbrowser-arrowscrollbox {
+/*#tabbrowser-arrowscrollbox {
   &::part(scrollbox-clip) {
     max-height: 405px;
   }
-}
+}*/
 
 #zen-tabbox-wrapper {
   position: relative;