From 96476e85ac7fc6cccfa791fe5c43b85048444b98 Mon Sep 17 00:00:00 2001
From: MrOtherGuy <jastekken@outlook.com>
Date: Wed, 4 Jun 2025 16:33:27 +0300
Subject: [PATCH] multi-row-tabs: Use tabbrowser-tabs as the tab container

This makes tabs scrollboxes have display:contents and thus makes tabs
use tabbrowser-tabs as their parent container.

Reason being that in firefox 141 the pinned tabs are moved to separate
scrollbox which would then have it's own display block.
Fixes #551
---
 chrome/multi-row_tabs.css | 42 +++++++++++++++++----------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/chrome/multi-row_tabs.css b/chrome/multi-row_tabs.css
index aec82bd..945f3b6 100644
--- a/chrome/multi-row_tabs.css
+++ b/chrome/multi-row_tabs.css
@@ -16,38 +16,32 @@ See the above repository for updates as well as full license text. */
   --multirow-tab-dynamic-width: 1; /* Change to 0 for fixed-width tabs using the above width. */
 }
 
-#tabbrowser-tabs{
+#tabbrowser-tabs[orient="horizontal"]{
   min-height: unset !important;
-  padding-inline-start: 0px !important
+  padding-inline-start: 0px !important;
+  --uc-scrollbutton-display-model: none;
+  --uc-scrollbox-display-model: contents;
+  flex-wrap: wrap;
+  overflow-y: auto;
+  overflow-x: hidden;
+  max-height: calc((var(--tab-min-height) + 2 * var(--tab-block-margin,0px)) * var(--multirow-n-rows));
+  scrollbar-color: currentColor transparent;
+  scrollbar-width: thin;
+  scrollbar-gutter: stable;
+  scroll-snap-type: y mandatory;
 }
 
 @-moz-document url(chrome://browser/content/browser.xhtml){
   #scrollbutton-up~spacer,
   #scrollbutton-up,
-  #scrollbutton-down{ display: var(--scrollbutton-display-model,initial) }
-
+  #scrollbutton-down{ display: var(--uc-scrollbutton-display-model,initial) }
+  
+  #pinned-tabs-container[orient="horizontal"],
+  #tabbrowser-arrowscrollbox[orient="horizontal"],
   scrollbox[part][orient="horizontal"] > slot,
-  scrollbox[part][orient="horizontal"]{
-    display: flex;
-    flex: 1;
-    flex-wrap: wrap;
-    overflow-y: auto;
-    max-height: calc((var(--tab-min-height) + 2 * var(--tab-block-margin,0px)) * var(--multirow-n-rows));
-    scrollbar-color: currentColor transparent;
-    scrollbar-width: thin;
-    scrollbar-gutter: stable;
-    scroll-snap-type: y mandatory;
+  scrollbox[part="scrollbox"][orient="horizontal"]{
+    display: var(--uc-scrollbox-display-model,initial) !important;
   }
-  scrollbox[part][orient="horizontal"] > slot{
-    overflow-x: hidden;
-  }
-}
-
-.scrollbox-clip[orient="horizontal"],
-#tabbrowser-arrowscrollbox{
-  overflow: -moz-hidden-unscrollable;
-  display: inline;
-  --scrollbutton-display-model: none;
 }
 
 .tabbrowser-tab{ scroll-snap-align: start; }