Merge pull request #449 from h3poteto/fix/hidding-menu

Fix disable some menu item when window is hidden in mac
h3poteto · Jul 22, 2018 · 9d28207 · 9d28207
2 parents dcc3850 + 2b9b79f
commit 9d28207
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/src/main/index.js b/src/main/index.js
@@ -242,20 +242,20 @@ async function createWindow () {
         },
         {
           type: 'separator'
-        }
-      ].concat(accountsChange)
-        .concat([
-          {
-            type: 'separator'
-          },
-          {
-            label: 'Jump to',
-            accelerator: 'CmdOrCtrl+K',
-            click: () => {
-              mainWindow.webContents.send('CmdOrCtrl+K')
-            }
+        },
+        {
+          label: 'Jump to',
+          accelerator: 'CmdOrCtrl+K',
+          enabled: true,
+          click: () => {
+            mainWindow.webContents.send('CmdOrCtrl+K')
           }
-        ])
+        },
+        {
+          type: 'separator'
+        },
+        ...accountsChange
+      ]
     }
   ]
 
@@ -308,6 +308,15 @@ app.on('window-all-closed', () => {
   // In macOS, close button does not shutdown application. It is hide application window.
   if (process.platform !== 'darwin') {
     app.quit()
+  } else {
+    // In MacOS, we should change disable some menu items.
+    const menu = Menu.getApplicationMenu()
+    // Preferences
+    menu.items[0].submenu.items[2].enabled = false
+    // New Toot
+    menu.items[1].submenu.items[0].enabled = false
+    // Jump to
+    menu.items[4].submenu.items[3].enabled = false
   }
 })