From c8839e984d3b259cd2f89331710e5bf64e429a5a Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 25 Aug 2022 15:45:38 +0900
Subject: [PATCH] Fix: Window Control - Size

---
 css/leptonChrome.css                   | 32 ++++++++++++++++++++------
 src/autohide/_common.scss              |  2 +-
 src/tabbar/layout/_window_control.scss |  4 +++-
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 4b544b7..81221c9 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -4485,10 +4485,13 @@
         display: block;
         top: 0;
         right: 0;
-        height: 40px;
         z-index: 1;
       }
 
+      #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+        height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+      }
+
       /* where window controls are on left */
       @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
         :root {
@@ -4645,10 +4648,13 @@
           display: block;
           top: 0;
           right: 0;
-          height: 40px;
           z-index: 1;
         }
 
+        #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+          height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+        }
+
         /* where window controls are on left */
         @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
           :root {
@@ -4802,10 +4808,13 @@
           display: block;
           top: 0;
           right: 0;
-          height: 40px;
           z-index: 1;
         }
 
+        #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+          height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+        }
+
         /* where window controls are on left */
         @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
           :root {
@@ -4962,10 +4971,13 @@
             display: block;
             top: 0;
             right: 0;
-            height: 40px;
             z-index: 1;
           }
 
+          #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+            height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+          }
+
           /* where window controls are on left */
           @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
             :root {
@@ -5132,10 +5144,13 @@
             display: block;
             top: 0;
             right: 0;
-            height: 40px;
             z-index: 1;
           }
 
+          #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+            height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+          }
+
           /* where window controls are on left */
           @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
             :root {
@@ -5289,10 +5304,13 @@
             display: block;
             top: 0;
             right: 0;
-            height: 40px;
             z-index: 1;
           }
 
+          #toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+            height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+          }
+
           /* where window controls are on left */
           @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
             :root {
@@ -7305,7 +7323,7 @@
 @supports -moz-bool-pref("userChrome.autohide.tabbar") or -moz-bool-pref("userChrome.autohide.navbar") or -moz-bool-pref(
     "userChrome.autohide.bookmarkbar"
   )
-  or -moz-bool-pref("userChrome.tabbar.one_liner") {
+  or -moz-bool-pref("userChrome.tabbar.one_liner") or -moz-bool-pref("userChrome.hidden.tabbar") {
   :root {
     --uc-tabbar-height: var(--tab-min-height);
     --uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height));
diff --git a/src/autohide/_common.scss b/src/autohide/_common.scss
index 8347e8a..02fc759 100644
--- a/src/autohide/_common.scss
+++ b/src/autohide/_common.scss
@@ -1,4 +1,4 @@
-@include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar", "userChrome.autohide.bookmarkbar", "userChrome.tabbar.one_liner") {
+@include Option("userChrome.autohide.tabbar", "userChrome.autohide.navbar", "userChrome.autohide.bookmarkbar", "userChrome.tabbar.one_liner", "userChrome.hidden.tabbar") {
   :root {
     --uc-tabbar-height: var(--tab-min-height); // calc((var(--tab-block-margin) * 2) + var(--tab-min-height));
     --uc-tabbar-hide-height: calc(-1 * var(--uc-tabbar-height));
diff --git a/src/tabbar/layout/_window_control.scss b/src/tabbar/layout/_window_control.scss
index 5e16b16..4a969d2 100644
--- a/src/tabbar/layout/_window_control.scss
+++ b/src/tabbar/layout/_window_control.scss
@@ -28,9 +28,11 @@ See the above repository for updates as well as full license text. */
   display: block;
   top: 0;
   right:0;
-  height: 40px;
   z-index: 1;
 }
+#toolbar-menubar[autohide="true"] > .titlebar-buttonbox-container {
+  height: var(--uc-titlebar-buttonbox-height, var(--uc-navbar-height, 36px));
+}
 
 /* where window controls are on left */
 @include OS($mac) {