From 40891ccd803181bdd7e9b4cd167ce065c44e5f3b Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Thu, 24 Mar 2022 02:32:40 +0900
Subject: [PATCH] Add: Option - Global menubar icons

---
 src/icons/_global_menu.scss  | 23 -----------------------
 src/icons/_main_menubar.scss | 22 ++++++++++++++++++++++
 src/menu/_icons_layout.scss  |  2 +-
 src/userChrome.scss          |  3 +++
 user.js                      |  1 +
 userChrome.css               |  9 +++++----
 6 files changed, 32 insertions(+), 28 deletions(-)
 create mode 100644 src/icons/_main_menubar.scss

diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss
index d87e89e..9585b9b 100644
--- a/src/icons/_global_menu.scss
+++ b/src/icons/_global_menu.scss
@@ -1,27 +1,4 @@
 /** Global Menu ***************************************************************/
-/*= main-menubar =============================================================*/
-#file-menu {
-  --menuitem-image: url("./icons/mail-inbox-all.svg");
-}
-#edit-menu {
-  --menuitem-image: url("chrome://global/skin/icons/edit.svg");
-}
-#view-menu {
-  --menuitem-image: url("./icons/content-view.svg");
-}
-#history-menu {
-  --menuitem-image: url("chrome://browser/skin/history.svg");
-}
-#bookmarksMenu {
-  --menuitem-image: url("chrome://browser/skin/bookmark.svg");
-}
-#tools-menu {
-  --menuitem-image: url("./icons/toolbox.svg");
-}
-#helpMenu {
-  --menuitem-image: url("chrome://global/skin/icons/help.svg");
-}
-
 /*= menu_FilePopup ===========================================================*/
 #menu_newNavigatorTab {
   --menuitem-image: url("chrome://browser/skin/new-tab.svg");
diff --git a/src/icons/_main_menubar.scss b/src/icons/_main_menubar.scss
new file mode 100644
index 0000000..ff5e21c
--- /dev/null
+++ b/src/icons/_main_menubar.scss
@@ -0,0 +1,22 @@
+/*= main-menubar =============================================================*/
+#file-menu {
+  --menuitem-image: url("./icons/mail-inbox-all.svg");
+}
+#edit-menu {
+  --menuitem-image: url("chrome://global/skin/icons/edit.svg");
+}
+#view-menu {
+  --menuitem-image: url("./icons/content-view.svg");
+}
+#history-menu {
+  --menuitem-image: url("chrome://browser/skin/history.svg");
+}
+#bookmarksMenu {
+  --menuitem-image: url("chrome://browser/skin/bookmark.svg");
+}
+#tools-menu {
+  --menuitem-image: url("./icons/toolbox.svg");
+}
+#helpMenu {
+  --menuitem-image: url("chrome://global/skin/icons/help.svg");
+}
diff --git a/src/menu/_icons_layout.scss b/src/menu/_icons_layout.scss
index 9551586..14fee19 100644
--- a/src/menu/_icons_layout.scss
+++ b/src/menu/_icons_layout.scss
@@ -62,7 +62,7 @@ menupopup:is(#context_sendTabToDevicePopupMenu, #context-sendpagetodevice-popup)
 }
 
 /* Menubar */
-@include Option("userChrome.icon.global_menu") {
+@include Option("userChrome.icon.global_menubar") {
   #main-menubar > menu {
     background-position: left var(--context-menu-background-padding-default) center !important;
     padding-inline-start: calc(16px + var(--context-menu-background-padding-default)) !important;
diff --git a/src/userChrome.scss b/src/userChrome.scss
index 30e3dcf..d281909 100644
--- a/src/userChrome.scss
+++ b/src/userChrome.scss
@@ -85,6 +85,9 @@
   @include Option("userChrome.icon.context_menu") {
     @import "icons/context_menu";
   }
+  @include Option("userChrome.icon.global_menubar") {
+    @import "icons/main_menubar";
+  }
   @include Option("userChrome.icon.global_menu") {
     @import "icons/global_menu";
   }
diff --git a/user.js b/user.js
index 51dba95..dafae6f 100644
--- a/user.js
+++ b/user.js
@@ -132,6 +132,7 @@ user_pref("userChrome.icon.panel",                true);
 user_pref("userChrome.icon.menu",                 true);
 user_pref("userChrome.icon.context_menu",         true);
 user_pref("userChrome.icon.global_menu",          true);
+user_pref("userChrome.icon.global_menubar",       true);
 
 // -- User Content -------------------------------------------------------------
 user_pref("userContent.player.ui",            true);
diff --git a/userChrome.css b/userChrome.css
index b7cfd96..3fe2e44 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -5625,7 +5625,7 @@
   }
 
   /* Menubar */
-  @supports -moz-bool-pref("userChrome.icon.global_menu") {
+  @supports -moz-bool-pref("userChrome.icon.global_menubar") {
     #main-menubar > menu {
       background-position: left var(--context-menu-background-padding-default) center !important;
       padding-inline-start: calc(16px + var(--context-menu-background-padding-default)) !important;
@@ -6669,8 +6669,7 @@
       --menuitem-image: url("chrome://global/skin/icons/settings.svg");
     }
   }
-  @supports -moz-bool-pref("userChrome.icon.global_menu") {
-    /** Global Menu ***************************************************************/
+  @supports -moz-bool-pref("userChrome.icon.global_menubar") {
     /*= main-menubar =============================================================*/
     #file-menu {
       --menuitem-image: url("./icons/mail-inbox-all.svg");
@@ -6699,7 +6698,9 @@
     #helpMenu {
       --menuitem-image: url("chrome://global/skin/icons/help.svg");
     }
-
+  }
+  @supports -moz-bool-pref("userChrome.icon.global_menu") {
+    /** Global Menu ***************************************************************/
     /*= menu_FilePopup ===========================================================*/
     #menu_newNavigatorTab {
       --menuitem-image: url("chrome://browser/skin/new-tab.svg");