From 34708e93bf23cec5a64d7225e5e4b36a543a019d Mon Sep 17 00:00:00 2001
From: MrOtherGuy <jastekken@outlook.com>
Date: Wed, 6 Feb 2019 13:15:16 +0200
Subject: [PATCH] Make menubar on top work better with different setups

---
 chrome/Fx65_tabs_on_bottom.css                | 27 ++++++++++++++-----
 ...65_tabs_on_bottom_menubar_on_top_patch.css |  4 ++-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/chrome/Fx65_tabs_on_bottom.css b/chrome/Fx65_tabs_on_bottom.css
index 3cfefdf..8b66376 100644
--- a/chrome/Fx65_tabs_on_bottom.css
+++ b/chrome/Fx65_tabs_on_bottom.css
@@ -1,27 +1,40 @@
 /* Modify to change window drag space width */
-:root[tabsintitlebar="true"] #nav-bar{ --window-drag-space-width: 24px }
+/*
+Use Fx65_tabs_on_bottom_menubar_on_top_patch if you
+have menubar permanently enabled and want it on top
+ */
+
+:root{ --uc-titlebar-padding: 0px; --uc-window-control-width: 138px }
+:root[sizemode="maximized"][tabsintitlebar]{ --uc-titlebar-padding: 8px }
+:root[tabsintitlebar="true"] #nav-bar{ --window-drag-space-width: 24px; }
+
 
 .titlebar-buttonbox-container{
   position: fixed;
-  top:0;
+  top: var(--uc-titlebar-padding,0px);
   right:0;
   height: 40px;
 }
-#toolbar-menubar[inactive] > .titlebar-buttonbox-container{ opacity: 0 }
-
-:root[sizemode="maximized"] > #navigator-toolbox{ padding-top: 8px !important; }
-:root[sizemode="maximized"] .titlebar-buttonbox-container{ top: 8px }
 
 :root[uidensity="compact"] .titlebar-buttonbox-container{ height: 32px }
+
+#toolbar-menubar[inactive] > .titlebar-buttonbox-container{ opacity: 0 }
+
+#navigator-toolbox{ padding-top: var(--uc-titlebar-padding,0px) !important; }
+
+
 .titlebar-buttonbox-container > .titlebar-buttonbox{ height: 100%; }
+
 #titlebar{
  -moz-box-ordinal-group: 2;
   -moz-appearance: none !important;
 }
+
 :root[tabsintitlebar="true"] #nav-bar{
-  padding-right: calc(138px + var(--window-drag-space-width,0px));
+  padding-right: calc(var(--uc-window-control-width) + var(--window-drag-space-width,0px));
   padding-left: var(--window-drag-space-width,0px)
 }
+
 .titlebar-placeholder,
 #TabsToolbar .titlebar-spacer{ display: none; }
 /* Also hide the toolbox bottom border which isn't at bottom with this setup */
diff --git a/chrome/Fx65_tabs_on_bottom_menubar_on_top_patch.css b/chrome/Fx65_tabs_on_bottom_menubar_on_top_patch.css
index 22da4b8..0ec5f8e 100644
--- a/chrome/Fx65_tabs_on_bottom_menubar_on_top_patch.css
+++ b/chrome/Fx65_tabs_on_bottom_menubar_on_top_patch.css
@@ -1,10 +1,12 @@
 /* Menubar on top patch - use with Fx65_tabs_on_bottom.css */
 /* Only really useful if menubar is ALWAYS visible */
 
+:root{ --uc-window-control-width: 0px !important }
+
 #navigator-toolbox{ margin-top: 22px }
 #toolbar-menubar{
   position: fixed;
-  top: 0px;
+  top: var(--uc-titlebar-padding,0px);
   height: 22px;
   margin-top:1px;
   width: 100%;