From 6cbfd045ad77aae857f0042a299216c065705231 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Mon, 13 Mar 2023 08:01:22 +0900
Subject: [PATCH] Fix: Iconst - Win11 native menu height #650

---
 css/leptonChrome.css               | 22 ++++++++++++++++++++++
 css/leptonContent.css              | 12 ++++++++++++
 src/icons/layout/_menu_common.scss | 18 +++++++++++++++++-
 src/padding/_global_menubar.scss   |  6 ++++++
 4 files changed, 57 insertions(+), 1 deletion(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index d9c032d..5c8e9b2 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -3848,6 +3848,16 @@
   #main-menubar > menu > menupopup menu {
     padding-block: var(--bookmark-menu-padding) !important;
   }
+  @supports -moz-bool-pref("userChrome.compatibility.os.win11") {
+    #main-menubar > menu > menupopup menuitem,
+    #main-menubar > menu > menupopup menu {
+      --bookmark-menu-padding: 3px;
+    }
+    #main-menubar > menu > menupopup menuitem:is([type="checkbox"], [type="radio"]),
+    #main-menubar > menu > menupopup menu:is([type="checkbox"], [type="radio"]) {
+      --bookmark-menu-padding: 0px;
+    }
+  }
 }
 /*= Panel - Reduce padding ===================================================*/
 @supports -moz-bool-pref("userChrome.padding.panel") {
@@ -10655,6 +10665,18 @@
           :root {
             --context-menu-background-padding: 5px;
           }
+          #main-menubar {
+            --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
+          }
+          menuitem:is([type="checkbox"], [type="radio"]) {
+            --menu-padding: 0px;
+          }
+          menuitem[checked="true"] {
+            --context-menu-background-padding: 0px;
+          }
+          menuitem[checked="true"] > .menu-iconic-left {
+            transform: translateX(2px);
+          }
         }
         menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
         menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
diff --git a/css/leptonContent.css b/css/leptonContent.css
index 6663c0f..addde32 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -3066,6 +3066,18 @@
             :root {
               --context-menu-background-padding: 5px;
             }
+            #main-menubar {
+              --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
+            }
+            menuitem:is([type="checkbox"], [type="radio"]) {
+              --menu-padding: 0px;
+            }
+            menuitem[checked="true"] {
+              --context-menu-background-padding: 0px;
+            }
+            menuitem[checked="true"] > .menu-iconic-left {
+              transform: translateX(2px);
+            }
           }
           menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menu-iconic > .menu-iconic-left,
           menupopup:is(#historyMenuPopup, #bookmarksMenuPopup) .menuitem-iconic > .menu-iconic-left,
diff --git a/src/icons/layout/_menu_common.scss b/src/icons/layout/_menu_common.scss
index 42bcf40..8bb595a 100644
--- a/src/icons/layout/_menu_common.scss
+++ b/src/icons/layout/_menu_common.scss
@@ -127,9 +127,25 @@ $_initialMenus: selector.append(
       --context-menu-background-padding: 3px;
       --menu-background-padding-default: 0px;
       @include _layout_win_native_context_text_padding;
-      @include Option("userChrome.compatibility.os.win11") {
+    }
+    @include Option("userChrome.compatibility.os.win11") {
+      :root {
         --context-menu-background-padding: 5px;
       }
+      #main-menubar {
+        --context-menu-background-padding: calc(5px + ((1.45em - 16px) / 2));
+      }
+      menuitem {
+        &:is([type="checkbox"], [type="radio"]) {
+          --menu-padding: 0px;
+        }
+        &[checked="true"] {
+          --context-menu-background-padding: 0px;
+          > .menu-iconic-left {
+            transform: translateX(2px);
+          }
+        }
+      }
     }
 
     @include NativeMenuPopup {
diff --git a/src/padding/_global_menubar.scss b/src/padding/_global_menubar.scss
index 2cd1c94..05024b9 100644
--- a/src/padding/_global_menubar.scss
+++ b/src/padding/_global_menubar.scss
@@ -26,4 +26,10 @@
 #main-menubar > menu > menupopup menuitem,
 #main-menubar > menu > menupopup menu {
   padding-block: var(--bookmark-menu-padding) !important;
+  @include Option("userChrome.compatibility.os.win11") {
+    --bookmark-menu-padding: 3px;
+    &:is([type="checkbox"], [type="radio"]) {
+      --bookmark-menu-padding: 0px;
+    }
+  }
 }