From e4744aaff76ac9dec81ee00815b1eaeb147af3c3 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sun, 28 Apr 2024 13:08:22 +0900
Subject: [PATCH] Fix: Theme - GTK None native menu

- Menu item border radius
- Separator border size
- Radio icon to checkmark
---
 css/leptonChrome.css            | 28 ++++++++++++++++++++++++++++
 css/leptonChromeESR.css         | 14 ++++++++++++++
 src/theme/_non_native_menu.scss | 12 ++++++++++++
 3 files changed, 54 insertions(+)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index c7dfe1b..9e3e3fa 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -1088,6 +1088,12 @@
       appearance: none !important;
     }
   }
+  @media (-moz-gtk-csd-available) {
+    menu,
+    menuitem {
+      border-radius: 0 !important;
+    }
+  }
   @media (-moz-gtk-csd-available) {
     menu > .menu-text,
     menuitem > .menu-text,
@@ -1172,6 +1178,11 @@
       appearance: none !important; /* to override more specific selectors above. */
       width: unset !important;
     }
+    .menu-iconic-left .menu-iconic-icon,
+    menuitem[type="checkbox"] .menu-iconic-icon,
+    menuitem[type="radio"] .menu-iconic-icon {
+      appearance: none !important;
+    }
   }
   @media (-moz-gtk-csd-available) {
     .menu-iconic > .menu-iconic-left,
@@ -1221,6 +1232,9 @@
       /* The side margins should align with the start of the menu item text. */
       margin: 2px 1em !important;
     }
+    menuseparator::before {
+      display: none !important; /* Original: block */
+    }
   }
   @media (-moz-gtk-csd-available) {
     menupopup {
@@ -14591,6 +14605,12 @@
     appearance: none !important;
   }
 }
+@media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
+  menu,
+  menuitem {
+    border-radius: 0 !important;
+  }
+}
 @media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
   menu > .menu-text,
   menuitem > .menu-text,
@@ -14675,6 +14695,11 @@
     appearance: none !important; /* to override more specific selectors above. */
     width: unset !important;
   }
+  .menu-iconic-left .menu-iconic-icon,
+  menuitem[type="checkbox"] .menu-iconic-icon,
+  menuitem[type="radio"] .menu-iconic-icon {
+    appearance: none !important;
+  }
 }
 @media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
   .menu-iconic > .menu-iconic-left,
@@ -14724,6 +14749,9 @@
     /* The side margins should align with the start of the menu item text. */
     margin: 2px 1em !important;
   }
+  menuseparator::before {
+    display: none !important; /* Original: block */
+  }
 }
 @media (-moz-bool-pref: "userChrome.theme.non_native_menu") and (-moz-gtk-csd-available) {
   menupopup {
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
index fddbd19..d0180f9 100644
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@@ -1311,6 +1311,12 @@
       appearance: none !important;
     }
   }
+  @media (-moz-gtk-csd-available) {
+    menu,
+    menuitem {
+      border-radius: 0 !important;
+    }
+  }
   @media (-moz-gtk-csd-available) {
     menu > .menu-text,
     menuitem > .menu-text,
@@ -1395,6 +1401,11 @@
       appearance: none !important; /* to override more specific selectors above. */
       width: unset !important;
     }
+    .menu-iconic-left .menu-iconic-icon,
+    menuitem[type="checkbox"] .menu-iconic-icon,
+    menuitem[type="radio"] .menu-iconic-icon {
+      appearance: none !important;
+    }
   }
   @media (-moz-gtk-csd-available) {
     .menu-iconic > .menu-iconic-left,
@@ -1444,6 +1455,9 @@
       /* The side margins should align with the start of the menu item text. */
       margin: 2px 1em !important;
     }
+    menuseparator::before {
+      display: none !important; /* Original: block */
+    }
   }
   @media (-moz-gtk-csd-available) {
     menupopup {
diff --git a/src/theme/_non_native_menu.scss b/src/theme/_non_native_menu.scss
index 62d1326..691fab6 100644
--- a/src/theme/_non_native_menu.scss
+++ b/src/theme/_non_native_menu.scss
@@ -24,6 +24,11 @@
     appearance: none !important;
   }
 
+  menu,
+  menuitem {
+    border-radius: 0 !important;
+  }
+
   /* Menu item text also needs native drawing disabled. */
   menu > .menu-text,
   menuitem > .menu-text,
@@ -95,6 +100,9 @@
   menuitem[type="radio"] {
     appearance: none !important; /* to override more specific selectors above. */
     width: unset !important;
+    .menu-iconic-icon {
+      appearance: none !important;
+    }
   }
 
   .menu-iconic > .menu-iconic-left,
@@ -140,6 +148,10 @@
     padding: 0 !important;
     /* The side margins should align with the start of the menu item text. */
     margin: 2px 1em !important;
+
+    &::before {
+      display: none !important; /* Original: block */
+    }
   }
 
   //-- Global - Menu Popup -----------------------------------------------------