From 5be445b0a0ddae1d3d56ed0ce05dff78c8f78b3c Mon Sep 17 00:00:00 2001
From: alstjr7375 <alstjr7375@daum.net>
Date: Tue, 7 Jun 2022 11:56:06 +0900
Subject: [PATCH] Add: Icons - Mac global menu

---
 css/leptonChrome.css         | 51 +++++++++++++++++++++++++++---------
 icons/arrow-between-down.svg |  3 +++
 icons/auto-fit-width.svg     |  3 +++
 src/icons/_global_menu.scss  | 23 ++++++++++++++++
 src/icons/_layout_menu.scss  |  8 +++---
 5 files changed, 70 insertions(+), 18 deletions(-)
 create mode 100644 icons/arrow-between-down.svg
 create mode 100644 icons/auto-fit-width.svg

diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 293001e..6f6637b 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -6014,9 +6014,9 @@
     > menupopup
     > menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
   :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-  menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+  menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
     menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-  menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+  menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
     menu:not(.menu-iconic, .in-menulist, [checked="true"]),
   menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
   menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu,
@@ -6055,9 +6055,9 @@
   :not(menu, #ContentSelectDropdown, #context-navigation)
     > menupopup
     > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-  menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+  menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
     menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-  menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+  menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
     menu:not(.menu-iconic, .in-menulist, [checked="true"]),
   menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
   menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu,
@@ -6110,9 +6110,9 @@
     :not(menu, #ContentSelectDropdown, #context-navigation)
       > menupopup
       > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
       menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
       menu:not(.menu-iconic, .in-menulist, [checked="true"]),
     menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
     menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu,
@@ -6139,9 +6139,9 @@
     :not(menu, #ContentSelectDropdown, #context-navigation)
       > menupopup
       > menu:not(.menu-iconic, .in-menulist, [checked="true"]),
-    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
       menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked="true"]),
-    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)
+    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
       menu:not(.menu-iconic, .in-menulist, [checked="true"]),
     menupopup:is(#organizeButtonPopup, #maintenanceButtonPopup) > menuitem,
     menupopup:is(#viewMenuPopup, #maintenanceButtonPopup) > menu,
@@ -6193,11 +6193,12 @@
     }
 
     /* Global Menu */
-    /* Disabled. some icons not appear
-     menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) menuitem:not(.menuitem-iconic, .bookmark-item, .in-menulist, [checked=true]), menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup) menu:not(.menu-iconic, .in-menulist, [checked=true]) {
-       list-style-image: var(--menuitem-image, url("../icons/blank.svg"));
-     }
-    */
+    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
+      menuitem:not(.menuitem-iconic, .bookmark-item),
+    menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)
+      menu:not(.menu-iconic) {
+      list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
+    }
   }
   /*= Bookmark Menu - Layout ===================================================*/
   /* #goPopup(Legacy of historyMenuPoup), #historyMenuPopup, #bookmarksMenuPopup: looks like global menu
@@ -7207,6 +7208,10 @@
       --menuitem-image: url("chrome://browser/skin/mail.svg");
     }
 
+    menu.share-tab-url-item {
+      --menuitem-image: url("chrome://browser/skin/share.svg");
+    }
+
     #menu_print {
       --menuitem-image: url("chrome://global/skin/icons/print.svg");
     }
@@ -7283,6 +7288,14 @@
       --menuitem-image: url("chrome://browser/skin/characterEncoding.svg");
     }
 
+    #enterFullScreenItem {
+      --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
+    }
+
+    #exitFullScreenItem {
+      --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+    }
+
     #fullScreenItem {
       /* checkbox */
       --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
@@ -7318,6 +7331,10 @@
       --menuitem-image: url("../icons/resize.svg");
     }
 
+    #toggle_zoom {
+      --menuitem-image: url("../icons/screenshot.svg");
+    }
+
     /*= goPopup ==================================================================*/
     #menu_showAllHistory {
       --menuitem-image: url("chrome://browser/skin/history.svg");
@@ -7440,6 +7457,14 @@
       --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg");
     }
 
+    /*= windowPopup ==============================================================*/
+    #windowPopup > menuitem[command="minimizeWindow"] {
+      --menuitem-image: url("../icons/arrow-between-down.svg");
+    }
+    #windowPopup > menuitem[command="zoomWindow"] {
+      --menuitem-image: url("../icons/auto-fit-width.svg");
+    }
+
     /*= menu_HelpPopup ===========================================================*/
     #menu_openHelp {
       --menuitem-image: url("chrome://global/skin/icons/help.svg");
diff --git a/icons/arrow-between-down.svg b/icons/arrow-between-down.svg
new file mode 100644
index 0000000..b15ee77
--- /dev/null
+++ b/icons/arrow-between-down.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M2.824.47a.47.47 0 0 0-.942 0v.471c0 .78.632 1.412 1.412 1.412h9.412c.78 0 1.412-.632 1.412-1.412v-.47a.47.47 0 0 0-.942 0v.47c0 .26-.21.47-.47.47H3.294a.47.47 0 0 1-.47-.47zM8 3.295c.26 0 .47.21.47.47V11.1l3.433-3.432a.47.47 0 0 1 .665.666l-4.235 4.235a.47.47 0 0 1-.666 0L3.432 8.333a.47.47 0 0 1 .665-.666L7.53 11.1V3.765c0-.26.211-.47.471-.47zM1.882 15.06c0-.78.632-1.412 1.412-1.412h9.412c.78 0 1.412.632 1.412 1.412v.47a.47.47 0 0 1-.942 0v-.47a.47.47 0 0 0-.47-.47H3.294a.47.47 0 0 0-.47.47v.47a.47.47 0 0 1-.942 0Z" style="stroke-width:.941176"/>
+</svg>
diff --git a/icons/auto-fit-width.svg b/icons/auto-fit-width.svg
new file mode 100644
index 0000000..6b39ade
--- /dev/null
+++ b/icons/auto-fit-width.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M16 2.5a.5.5 0 0 0-1 0v11a.5.5 0 0 0 1 0zm-15 0a.5.5 0 0 0-1 0v11a.5.5 0 0 0 1 0Zm11.854 5.146a.5.5 0 0 1 0 .708l-2 2a.5.5 0 0 1-.708-.708L11.293 8.5H4.707l1.147 1.146a.5.5 0 0 1-.708.708l-2-2a.5.5 0 0 1 0-.708l2-2a.5.5 0 1 1 .708.708L4.707 7.5h6.586l-1.147-1.146a.5.5 0 0 1 .708-.708z"/>
+</svg>
diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss
index 805f69d..615216d 100644
--- a/src/icons/_global_menu.scss
+++ b/src/icons/_global_menu.scss
@@ -32,6 +32,9 @@
 #menu_sendLink {
   --menuitem-image: url("chrome://browser/skin/mail.svg");
 }
+menu.share-tab-url-item {
+  --menuitem-image: url("chrome://browser/skin/share.svg");
+}
 
 #menu_printPreview {
 }
@@ -111,6 +114,12 @@
   --menuitem-image: url("chrome://browser/skin/characterEncoding.svg");
 }
 
+#enterFullScreenItem {
+  --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
+}
+#exitFullScreenItem {
+  --menuitem-image: url("chrome://browser/skin/fullscreen-exit.svg");
+}
 #fullScreenItem {
   /* checkbox */
   --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
@@ -142,6 +151,10 @@
   --menuitem-image: url("../icons/resize.svg");
 }
 
+#toggle_zoom {
+  --menuitem-image: url("../icons/screenshot.svg");
+}
+
 /*= goPopup ==================================================================*/
 #menu_showAllHistory {
   --menuitem-image: url("chrome://browser/skin/history.svg");
@@ -259,6 +272,16 @@
   --menuitem-image: url("chrome://devtools/skin/images/debugging-addons.svg");
 }
 
+/*= windowPopup ==============================================================*/
+#windowPopup > menuitem {
+  &[command="minimizeWindow"] {
+    --menuitem-image: url("../icons/arrow-between-down.svg");
+  }
+  &[command="zoomWindow"] {
+    --menuitem-image: url("../icons/auto-fit-width.svg");
+  }
+}
+
 /*= menu_HelpPopup ===========================================================*/
 #menu_openHelp {
   --menuitem-image: url("chrome://global/skin/icons/help.svg");
diff --git a/src/icons/_layout_menu.scss b/src/icons/_layout_menu.scss
index 5ed737c..499fe86 100644
--- a/src/icons/_layout_menu.scss
+++ b/src/icons/_layout_menu.scss
@@ -7,7 +7,7 @@ $_iconMenu: "menu:not(.menu-iconic, #{$_iconNoneCommon})";
 // Components
 $_nestedPopupIcon: ":not(menu, #ContentSelectDropdown) > menupopup >";
 $_nestedPopupPadding: ":not(menu, #ContentSelectDropdown, #context-navigation) > menupopup >";
-$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #menu_HelpPopup)";
+$_iconMenuPopup: "menupopup:is(#menu_FilePopup, #menu_EditPopup, #menu_viewPopup, #goPopup, #historyMenuPopup, #bookmarksMenuPopup, #menu_ToolsPopup, #windowPopup, #menu_HelpPopup)";
 
 $_nestedPopupIconMenus: selector.nest(
   $_nestedPopupIcon,
@@ -192,9 +192,7 @@ $_layoutCommonMenus: (
   }
 
   /* Global Menu */
-  /* Disabled. some icons not appear
-  #{$_iconMenuPopupMenus} {
-    list-style-image: var(--menuitem-image, url("../icons/blank.svg"));
+  #{selector.nest($_iconMenuPopup, "menuitem:not(.menuitem-iconic, .bookmark-item), menu:not(.menu-iconic)")} {
+    list-style-image: var(--menuitem-image, url("../icons/blank.svg")) !important;
   }
- */
 }