From 3adc61b7d4e91769eb6ef9cdfce32df2c48503ad Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Wed, 24 Aug 2022 00:53:33 +0900
Subject: [PATCH] Fix: Window Control - Mac

---
 css/leptonChrome.css                        | 28 +++++++++++++++++++--
 src/tabbar/layout/_window_control.scss      |  5 ++++
 src/tabbar/layout/_window_control_size.scss |  7 +++++-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 06f3a6c..194200a 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -4430,12 +4430,16 @@
       --uc-window-control-width: 138px;
     }
   }
+
   @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
-    :root:is([tabsintitlebar], [sizemode="fullscreen"]) {
+    :root[tabsintitlebar] {
       --uc-window-control-width: 72px;
     }
-  }
 
+    :root[sizemode="fullscreen"] {
+      --uc-widow-control-space: 0;
+    }
+  }
   :root:is([tabsintitlebar][sizemode="maximized"], [sizemode="fullscreen"]) {
     --uc-window-drag-space-pre: 0px;
     /* Remove pre space */
@@ -4483,6 +4487,11 @@
           left: 0;
           right: unset !important;
         }
+
+        #toolbar-menubar:not([autohide="true"]) {
+          visibility: visible !important;
+          height: 0;
+        }
       }
       #navigator-toolbox {
         padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important;
@@ -4626,6 +4635,11 @@
             left: 0;
             right: unset !important;
           }
+
+          #toolbar-menubar:not([autohide="true"]) {
+            visibility: visible !important;
+            height: 0;
+          }
         }
         #navigator-toolbox {
           padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important;
@@ -4769,6 +4783,11 @@
               left: 0;
               right: unset !important;
             }
+
+            #toolbar-menubar:not([autohide="true"]) {
+              visibility: visible !important;
+              height: 0;
+            }
           }
           #navigator-toolbox {
             padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important;
@@ -4922,6 +4941,11 @@
               left: 0;
               right: unset !important;
             }
+
+            #toolbar-menubar:not([autohide="true"]) {
+              visibility: visible !important;
+              height: 0;
+            }
           }
           #navigator-toolbox {
             padding-top: calc(var(--uc-menubar-height, 0px) + var(--uc-titlebar-padding)) !important;
diff --git a/src/tabbar/layout/_window_control.scss b/src/tabbar/layout/_window_control.scss
index eef3fc9..ca11c3d 100644
--- a/src/tabbar/layout/_window_control.scss
+++ b/src/tabbar/layout/_window_control.scss
@@ -30,6 +30,11 @@ See the above repository for updates as well as full license text. */
     left:0;
     right: unset !important;
   }
+
+  #toolbar-menubar:not([autohide="true"]) {
+    visibility: visible !important;
+    height: 0;
+  }
 }
 
 #navigator-toolbox {
diff --git a/src/tabbar/layout/_window_control_size.scss b/src/tabbar/layout/_window_control_size.scss
index c3bb050..e62c59b 100644
--- a/src/tabbar/layout/_window_control_size.scss
+++ b/src/tabbar/layout/_window_control_size.scss
@@ -17,9 +17,14 @@
   @include OS($win10) {
     --uc-window-control-width: 138px;
   }
-  @include OS($mac) {
+}
+@include OS($mac) {
+  :root[tabsintitlebar] {
     --uc-window-control-width: 72px;
   }
+  :root[sizemode="fullscreen"] {
+    --uc-widow-control-space: 0;
+  }
 }
 
 :root:is([tabsintitlebar][sizemode="maximized"], [sizemode="fullscreen"]) {