From feba8a6403ce21e832b5cf457b2fd1e2f70fc06d Mon Sep 17 00:00:00 2001
From: MrOtherGuy <jastekken@outlook.com>
Date: Fri, 8 Feb 2019 10:47:26 +0200
Subject: [PATCH] Use similar code for window drag space in all stylesheets
 part2

---
 chrome/Fx65_tabs_on_bottom.css                |  3 ++-
 chrome/hide_tabs_with_one_tab.css             |  2 +-
 ...ar_tabs_oneliner_menu_buttons_on_right.css | 20 +++++++++++++------
 chrome/navbar_tabs_oneliner_tabs_on_left.css  | 15 ++++++++++++--
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/chrome/Fx65_tabs_on_bottom.css b/chrome/Fx65_tabs_on_bottom.css
index 168047b..33e4aab 100644
--- a/chrome/Fx65_tabs_on_bottom.css
+++ b/chrome/Fx65_tabs_on_bottom.css
@@ -32,7 +32,8 @@ have menubar permanently enabled and want it on top
   -moz-appearance: none !important;
 }
 
-:root[tabsintitlebar="true"] #nav-bar{
+/* Space to drag the window on both sides of navbar */
+:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
   padding-right: calc(var(--uc-window-control-width) + var(--window-drag-space-width,0px));
   padding-left: var(--window-drag-space-width,0px)
 }
diff --git a/chrome/hide_tabs_with_one_tab.css b/chrome/hide_tabs_with_one_tab.css
index 3ab64e9..da85245 100644
--- a/chrome/hide_tabs_with_one_tab.css
+++ b/chrome/hide_tabs_with_one_tab.css
@@ -38,5 +38,5 @@
   height: calc(var(--tab-min-height) + var(--space-above-tabbar) - 1px) !important;
   -moz-appearance: initial !important;
 }
-
+/* Space to drag the window on both sides of navbar */
 :root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar { padding: 0px var(--window-drag-space-width,0px) }
diff --git a/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css b/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css
index 8b24bea..b3ece17 100644
--- a/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css
+++ b/chrome/navbar_tabs_oneliner_menu_buttons_on_right.css
@@ -1,7 +1,12 @@
 /* Modify these to change relative widths or default height */
-#navigator-toolbox{ --uc-navigationbar-width: 50vw; --uc-toolbar-height: 40px; --window-drag-space-width: 20px}
+#navigator-toolbox{
+  --uc-navigationbar-width: 50vw;
+  --uc-window-control-width: 138px;
+  --uc-toolbar-height: 40px;
+  --window-drag-space-width: 20px
+}
 /* reserved space for overflow + menu buttons */
-#navigator-toolbox{ --uc-buttons-width: calc(56px + 4 * var(--toolbarbutton-outer-padding) + var(--uc-menubutton-padding,6px))}
+#navigator-toolbox{--uc-buttons-width: calc(56px + 4 * var(--toolbarbutton-outer-padding) + var(--uc-menubutton-padding,6px))}
 #nav-bar:not([overflowing]) > #nav-bar-customization-target{ --uc-buttons-width: calc(28px + 2 * var(--toolbarbutton-outer-padding) + 6px) }
 /* Override for other densities */
 :root[uidensity="compact"] > #navigator-toolbox{ --uc-toolbar-height: 32px; --uc-menubutton-padding: 0px}
@@ -17,11 +22,14 @@
 #tabbrowser-tabs{ --tab-min-height: var(--uc-toolbar-height) !important; }
 /* This isn't useful when tabs start in the middle of the window */
 .titlebar-placeholder[type="pre-tabs"],.titlebar-spacer[type="pre-tabs"]{ width:8px !important}
-#nav-bar{
-  margin-right:calc(3 * 46px + var(--window-drag-space-width));
-  margin-top: calc(0px - var(--uc-toolbar-height));
-  padding-left: var(--window-drag-space-width);
+#nav-bar{ margin-top: calc(0px - var(--uc-toolbar-height)); }
+
+/* Space to drag the window on both sides of navbar */
+:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
+  padding-right: calc(var(--uc-window-control-width) + var(--window-drag-space-width,0px));
+  padding-left: var(--window-drag-space-width,0px)
 }
+
 #nav-bar-customization-target{ margin-right: calc(100vw - (var(--uc-navigationbar-width)) - var(--uc-buttons-width) - (3 * 46px) - var(--window-drag-space-width)) }
 #TabsToolbar > :not(hbox){ position: relative !important; z-index: 2 }
 .titlebar-placeholder[type="post-tabs"],
diff --git a/chrome/navbar_tabs_oneliner_tabs_on_left.css b/chrome/navbar_tabs_oneliner_tabs_on_left.css
index 8ec1be0..4ac94ab 100644
--- a/chrome/navbar_tabs_oneliner_tabs_on_left.css
+++ b/chrome/navbar_tabs_oneliner_tabs_on_left.css
@@ -1,5 +1,10 @@
 /* Modify these to change relative widths or default height */
-#navigator-toolbox{ --uc-navigationbar-width: 40vw; --uc-toolbar-height: 40px; --window-drag-space-width: 20px}
+#navigator-toolbox{
+  --uc-navigationbar-width: 40vw;
+  --uc-toolbar-height: 40px;
+  --window-drag-space-width: 20px;
+  --uc-window-control-width: 138px;
+}
 /* Override for other densities */
 :root[uidensity="compact"] > #navigator-toolbox{ --uc-toolbar-height: 32px;}
 :root[uidensity="touch"] > #navigator-toolbox{ --uc-toolbar-height: 40px; }
@@ -31,7 +36,13 @@
 #nav-bar{
   margin-left: calc(100vw - var(--uc-navigationbar-width));
   margin-top: calc(0px - var(--uc-toolbar-height));
-  padding-right: calc(3 * 46px + var(--window-drag-space-width));
+  padding-left: 0px !important;
+}
+
+/* Space to drag the window on both sides of navbar */
+:root[tabsintitlebar="true"]:not([inFullscreen]) #nav-bar{
+  padding-right: calc(var(--uc-window-control-width) + var(--window-drag-space-width,0px));
+  padding-left: var(--window-drag-space-width,0px)
 }
 
 /* 1px margin on touch density causes tabs to be too high */