From c9b690a65176c4440fea1e224bb38f2b6ecc3bd6 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Mon, 4 Jul 2022 02:28:57 +0900
Subject: [PATCH] Fix: One Liner - Clean & Pre spacer

---
 css/leptonChrome.css            | 49 ++++++++++++++++++---------------
 src/padding/_tabbar_width.scss  |  8 ++++--
 src/tabbar/_one_line.scss       | 30 ++++++++++----------
 src/tabbar/_tabs_on_bottom.scss |  4 +--
 4 files changed, 49 insertions(+), 42 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 26e5930..b20429e 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3015,14 +3015,19 @@
 }
 @supports -moz-bool-pref("userChrome.padding.tabbar_width") {
   /* Titlebar Space */
-  .titlebar-spacer[type="pre-tabs"] {
-    width: 30px !important;
+  :root {
+    --uc-title-pre-spacer: 30px;
+    /* Original: 40px */
+    --uc-title-post-spacer: 25px;
     /* Original: 40px */
   }
 
+  .titlebar-spacer[type="pre-tabs"] {
+    width: var(--uc-title-pre-spacer) !important;
+  }
+
   .titlebar-spacer[type="post-tabs"] {
-    width: 25px !important;
-    /* Original: 40px */
+    width: var(--uc-title-post-spacer) !important;
   }
 
   /* Tabbar Buttons */
@@ -3822,8 +3827,8 @@
   :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
     --uc-window-control-width: 84px;
     /* 84px is default value of linux */
-    --uc-window-drag-space-pre: 30px;
-    --uc-window-drag-space-post: 25px;
+    --uc-window-drag-space-pre: var(--uc-title-pre-spacer);
+    --uc-window-drag-space-post: var(--uc-title-post-spacer);
   }
 
   :root:is([tabsintitlebar][sizemode="maximized"], [sizemode="fullscreen"]) {
@@ -3960,29 +3965,20 @@
 }
 /*= Tab Bar - Oneliner =======================================================*/
 @supports -moz-bool-pref("userChrome.tab.one_line") {
+  :root {
+    --uc-navbar-size: 40vw;
+  }
+
   #navigator-toolbox {
-    display: flex !important;
-    flex-wrap: wrap;
     background-color: var(--toolbar-bgcolor) !important;
   }
 
-  :root {
-    --navbar-size: 40vw;
-  }
-
-  #titlebar,
-  #nav-bar,
-  #PersonalToolbar,
-  #tab-notification-deck-template {
-    flex-basis: 100vw;
-  }
-
   #TabsToolbar {
-    margin-left: var(--navbar-size) !important;
+    margin-left: var(--uc-navbar-size) !important;
   }
 
   #nav-bar {
-    margin-right: calc(100vw - var(--navbar-size)) !important;
+    margin-right: calc(100vw - var(--uc-navbar-size)) !important;
     margin-top: calc(-1 * var(--tab-min-height)) !important;
     height: var(--tab-min-height) !important;
   }
@@ -3992,9 +3988,18 @@
   }
 
   toolbarspring.chromeclass-toolbar-additional,
-  .titlebar-spacer {
+  .titlebar-spacer[type="pre-tabs"] {
     display: none !important;
   }
+
+  :root:not([sizemode="maximized"]) #nav-bar {
+    padding-inline-start: 40px !important;
+  }
+  @supports -moz-bool-pref("userChrome.padding.tabbar_width") {
+    :root:not([sizemode="maximized"]) #nav-bar {
+      padding-inline-start: var(--uc-title-pre-spacer) !important;
+    }
+  }
 }
 /*= Tab Bar - Connect to window ==============================================*/
 @supports -moz-bool-pref("userChrome.tab.connect_to_window") {
diff --git a/src/padding/_tabbar_width.scss b/src/padding/_tabbar_width.scss
index 52b2b7e..a0e58bd 100644
--- a/src/padding/_tabbar_width.scss
+++ b/src/padding/_tabbar_width.scss
@@ -1,9 +1,13 @@
 /* Titlebar Space */
+:root {
+  --uc-title-pre-spacer: 30px; /* Original: 40px */
+  --uc-title-post-spacer: 25px; /* Original: 40px */
+}
 .titlebar-spacer[type="pre-tabs"] {
-  width: 30px !important; /* Original: 40px */
+  width: var(--uc-title-pre-spacer) !important;
 }
 .titlebar-spacer[type="post-tabs"] {
-  width: 25px !important; /* Original: 40px */
+  width: var(--uc-title-post-spacer) !important;
 }
 
 /* Tabbar Buttons */
diff --git a/src/tabbar/_one_line.scss b/src/tabbar/_one_line.scss
index 4ea9ff8..695e224 100644
--- a/src/tabbar/_one_line.scss
+++ b/src/tabbar/_one_line.scss
@@ -1,25 +1,16 @@
+:root {
+  --uc-navbar-size: 40vw;
+}
+
 #navigator-toolbox {
-  display: flex !important;
-  flex-wrap: wrap;
   background-color: var(--toolbar-bgcolor) !important;
 }
 
-:root {
-  --navbar-size: 40vw;
-}
-
-#titlebar,
-#nav-bar,
-#PersonalToolbar,
-#tab-notification-deck-template {
-  flex-basis: 100vw;
-}
-
 #TabsToolbar {
-  margin-left: var(--navbar-size) !important;
+  margin-left: var(--uc-navbar-size) !important;
 }
 #nav-bar {
-  margin-right: calc(100vw - var(--navbar-size)) !important;
+  margin-right: calc(100vw - var(--uc-navbar-size)) !important;
   margin-top: calc(-1 * var(--tab-min-height)) !important;
   height: var(--tab-min-height) !important;
 }
@@ -29,6 +20,13 @@
 }
 
 toolbarspring.chromeclass-toolbar-additional,
-.titlebar-spacer {
+.titlebar-spacer[type="pre-tabs"] {
   display: none !important;
 }
+
+:root:not([sizemode="maximized"]) #nav-bar {
+  padding-inline-start: 40px !important;
+  @include Option("userChrome.padding.tabbar_width") {
+    padding-inline-start: var(--uc-title-pre-spacer) !important;
+  }
+}
diff --git a/src/tabbar/_tabs_on_bottom.scss b/src/tabbar/_tabs_on_bottom.scss
index f197f8a..4b06545 100644
--- a/src/tabbar/_tabs_on_bottom.scss
+++ b/src/tabbar/_tabs_on_bottom.scss
@@ -117,8 +117,8 @@ See the above repository for updates as well as full license text. */
 }
 :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
   --uc-window-control-width: 84px; /* 84px is default value of linux */
-  --uc-window-drag-space-pre: 30px;
-  --uc-window-drag-space-post: 25px;
+  --uc-window-drag-space-pre: var(--uc-title-pre-spacer); // 30px
+  --uc-window-drag-space-post: var(--uc-title-post-spacer); // 25px
 }
 :root:is([tabsintitlebar][sizemode="maximized"], [sizemode="fullscreen"]) {
   --uc-window-drag-space-pre: 0px; /* Remove pre space */