From 6fbecef4014304cd111f727633497d3305189bf0 Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Sat, 4 Jun 2022 01:02:30 +0900
Subject: [PATCH] Fix: Icons - Native Menu apply at context menu

---
 css/leptonChrome.css                      | 2 +-
 css/leptonContent.css                     | 4 ++--
 src/icons/context_menu/_content_area.scss | 2 +-
 src/leptonChrome.scss                     | 1 +
 src/leptonContent.scss                    | 1 +
 src/library/_contents_menu.scss           | 4 ++--
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 24582eb..fa721a9 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6725,7 +6725,7 @@
       /* iconic */
     }
 
-    @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+    @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
       #context-back {
         --menuitem-image: url("chrome://browser/skin/back.svg");
       }
diff --git a/css/leptonContent.css b/css/leptonContent.css
index f7e03e6..587c725 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2038,8 +2038,8 @@
         background-image: var(--menuitem-image);
       }
 
-      /* For native context menus on macOS */
-      @supports -moz-bool-pref("widget.macos.native-context-menus") {
+      /* For native context menus */
+      @supports -moz-bool-pref("widget.macos.native-context-menus") or -moz-bool-pref("widget.gtk.native-context-menus") {
         :not(menu, #ContentSelectDropdown)
           > menupopup
           > menuitem:not(.menuitem-iconic, .in-menulist, [type="checkbox"], [checked="true"]),
diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss
index 903bc43..01580aa 100644
--- a/src/icons/context_menu/_content_area.scss
+++ b/src/icons/context_menu/_content_area.scss
@@ -239,7 +239,7 @@
   /* iconic */
 }
 
-@supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
+@include NativeMenu {
   #context-back {
     --menuitem-image: url("chrome://browser/skin/back.svg");
   }
diff --git a/src/leptonChrome.scss b/src/leptonChrome.scss
index 6959f57..353bd45 100644
--- a/src/leptonChrome.scss
+++ b/src/leptonChrome.scss
@@ -2,6 +2,7 @@
 @use "utils/option" as *;
 @use "utils/color_scheme" as *;
 @use "utils/theme" as *;
+@use "utils/native_menu" as *;
 @use "utils/proton_elements" as Proton;
 @use "sass:selector";
 
diff --git a/src/leptonContent.scss b/src/leptonContent.scss
index 9994bd5..200b0ba 100644
--- a/src/leptonContent.scss
+++ b/src/leptonContent.scss
@@ -1,6 +1,7 @@
 @use "utils/os" as *;
 @use "utils/option" as *;
 @use "utils/color_scheme" as *;
+@use "utils/native_menu" as *;
 @use "utils/proton_elements" as Proton;
 
 @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/src/library/_contents_menu.scss b/src/library/_contents_menu.scss
index a11e506..59ed236 100644
--- a/src/library/_contents_menu.scss
+++ b/src/library/_contents_menu.scss
@@ -46,8 +46,8 @@ $_library_menuSelector: _library_iconTargetSelector("menu");
   background-image: var(--menuitem-image);
 }
 
-/* For native context menus on macOS */
-@supports -moz-bool-pref("widget.macos.native-context-menus") {
+/* For native context menus */
+@include NativeMenu {
   @include _library_nativeContextMenu {
     list-style-image: var(--menuitem-image) !important;
   }