From b88c1f5bf1bcd51800afe15713c70aeeb8dfeba6 Mon Sep 17 00:00:00 2001
From: MrOtherGuy <jastekken@outlook.com>
Date: Thu, 5 Jan 2023 15:21:48 +0200
Subject: [PATCH] Improvements for hide_tabs_scrollbuttons

This patch "unhides" tabs scrollbox overflow indicators as well as adds
background for scrollbuttons when re-oredering tabs. Both of these are
pretty complicated things to achieve, so this patch also adds a small
compatibility layer for non_floating_sharp_tabs.css
---
 chrome/hide_tabs_scrollbuttons.css | 67 +++++++++++++++++++++++++-----
 chrome/non_floating_sharp_tabs.css | 16 ++++++-
 2 files changed, 71 insertions(+), 12 deletions(-)

diff --git a/chrome/hide_tabs_scrollbuttons.css b/chrome/hide_tabs_scrollbuttons.css
index 0225ca6..238939c 100644
--- a/chrome/hide_tabs_scrollbuttons.css
+++ b/chrome/hide_tabs_scrollbuttons.css
@@ -3,14 +3,61 @@ See the above repository for updates as well as full license text. */
 
 /* This should hide tabs scrollbuttons in a manner that preserves the ability to move tab strip when reordering tabs */
 
-#tabbrowser-tabs:not([movingtab]){ --uc-scroll-visibility: hidden }
-#tabbrowser-tabs[overflow]{ --uc-scrollbox-margin: -28px }
-
-#scrollbutton-up{ position: relative;z-index: 1 }
-
-#scrollbutton-up,
-#scrollbutton-down,
-#scrollbutton-up ~ spacer{
-  visibility: var(--uc-scroll-visibility,visible);
+#tabbrowser-arrowscrollbox{
+  --uc-compat-scrollbutton-margin: 1px; /* compatibility for non_floating_sharp_tabs.css */
+  --uc-scrollbutton-up-background: linear-gradient(-90deg,transparent,var(--lwt-accent-color) 35%);
+  --uc-scrollbutton-down-background: linear-gradient(90deg,transparent,var(--lwt-accent-color) 35%);
+}
+
+#tabbrowser-tabs:not([movingtab]){
+  --uc-scroll-visibility: hidden;
+}
+#tabbrowser-tabs[overflow]{
+  --uc-scrollbox-base-margin: -31px;
+  --uc-scrollbox-margin: calc(var(--uc-scrollbox-base-margin) + var(--tab-shadow-max-size));
+}
+:root[uidensity="compact"] #tabbrowser-tabs[overflow]{
+  --uc-scrollbox-base-margin: -25px;
+}
+#tabbrowser-arrowscrollbox:not([scrolledtostart="true"]){
+  --uc-scrollbox-overflow-start-margin: -1px;
+}
+#scrollbutton-up ~ spacer{
+  visibility: visible !important;
+}
+spacer[part="overflow-start-indicator"]{
+  -moz-box-ordinal-group: 0;
+  margin-inline-start: var(--uc-scrollbox-overflow-start-margin,-0.5px) !important;
+}
+spacer[part="overflow-end-indicator"]{
+  -moz-box-ordinal-group: 2;
+}
+
+#scrollbutton-down[disabled="true"] > .toolbarbutton-icon,
+#scrollbutton-up[disabled="true"] > .toolbarbutton-icon{
+  opacity: 0.4;
+} 
+#scrollbutton-up,
+#scrollbutton-down{
+  position: relative;
+  z-index: 1;
+  visibility: var(--uc-scroll-visibility,visible);
+  background-clip: border-box !important;
+  background-origin: initial !important;
+  background-repeat: no-repeat !important;
+  opacity: 1 !important;
+}
+#scrollbutton-up{
+  margin-inline-start: calc(0px - var(--tab-shadow-max-size,0px)) !important;
+  background-image: var(--uc-scrollbutton-up-background);
+}
+#scrollbutton-down{
+  margin-inline-end: calc(0px - var(--tab-shadow-max-size,0px)) !important;
+  background-image: var(--uc-scrollbutton-down-background);
+}
+.scrollbox-clip{ margin-inline: var(--uc-scrollbox-margin,0px); }
+
+/* Need to reset some things for other scrollboxes */
+.menupopup-arrowscrollbox{
+  --tab-shadow-max-size: 0;
 }
-.scrollbox-clip{ margin-inline: var(--uc-scrollbox-margin,0); }
diff --git a/chrome/non_floating_sharp_tabs.css b/chrome/non_floating_sharp_tabs.css
index cfd176d..2b8886f 100644
--- a/chrome/non_floating_sharp_tabs.css
+++ b/chrome/non_floating_sharp_tabs.css
@@ -56,12 +56,24 @@ See the above repository for updates as well as full license text. */
 }
 
 #scrollbutton-up,
-#scrollbutton-down{ border-radius: 0 !important; border-width: 0 !important; padding-inline: 3px !important; }
+#scrollbutton-down{
+  border-radius: 0 !important;
+  border-width: 0 !important;
+  padding-inline: 3px !important;
+  margin-bottom: var(--uc-compat-scrollbutton-margin,0px) !important; /* set in hide_tabs_scrollbuttons.css */
+}
+
+/* This is for hide_tabs_scrollbuttons.css compatibility since we modify scrollbutton width */
+#tabbrowser-tabs[overflow]{
+  --uc-scrollbox-base-margin: -22px !important;
+}
 
 /* tab shaping */
 .tabbrowser-tab{ padding-inline: 0 !important; }
 
-:root[uidensity="compact"] #tabbrowser-tabs[positionpinnedtabs] .tabbrowser-tab[pinned]{ min-height: calc(var(--tab-min-height) + 2px) !important; }
+:root[uidensity="compact"] #tabbrowser-tabs[positionpinnedtabs] .tabbrowser-tab[pinned]{
+  min-height: calc(var(--tab-min-height) + 2px) !important;
+}
 
 .tab-content[pinned]{ padding-inline: 11px !important; }