Merge pull request #1550 from h3poteto/fix/mac-menu

Remove menu bar menu when platform is darwin
h3poteto · Jun 15, 2020 · 9aca310 · 9aca310
2 parents ffa5e21 + dc6fb57
commit 9aca310
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -1241,6 +1241,23 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
           }
         ]
 
+  const macWindowMenu: Array<MenuItemConstructorOptions> =
+    process.platform === 'darwin'
+      ? []
+      : [
+          {
+            label: i18n.t('main_menu.window.always_show_menu_bar'),
+            type: 'checkbox',
+            checked: !menu.autoHideMenu,
+            click: item => {
+              changeMenuAutoHide(!item.checked)
+            }
+          },
+          {
+            type: 'separator'
+          }
+        ]
+
   const template: Array<MenuItemConstructorOptions> = [
     {
       label: i18n.t('main_menu.application.name'),
@@ -1345,17 +1362,7 @@ const ApplicationMenu = (accountsChange: Array<MenuItemConstructorOptions>, menu
     {
       label: i18n.t('main_menu.window.name'),
       submenu: [
-        {
-          label: i18n.t('main_menu.window.always_show_menu_bar'),
-          type: 'checkbox',
-          checked: !menu.autoHideMenu,
-          click: item => {
-            changeMenuAutoHide(!item.checked)
-          }
-        },
-        {
-          type: 'separator'
-        },
+        ...macWindowMenu,
         {
           label: i18n.t('main_menu.window.close'),
           role: 'close'