fix: windowmenu did not show the window list on macOS

electron · Jan 14, 2019 · 4c669ea · 4c669ea
1 parent df62e78
commit 4c669ea
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/atom/browser/ui/cocoa/atom_menu_controller.mm b/atom/browser/ui/cocoa/atom_menu_controller.mm
@@ -231,7 +231,9 @@ - (void)addItemToMenu:(NSMenu*)menu
     [item setSubmenu:submenu];
 
     // Set submenu's role.
-    if (role == base::ASCIIToUTF16("window") && [submenu numberOfItems])
+    if ((role == base::ASCIIToUTF16("window") ||
+         role == base::ASCIIToUTF16("windowmenu")) &&
+        [submenu numberOfItems])
       [NSApp setWindowsMenu:submenu];
     else if (role == base::ASCIIToUTF16("help"))
       [NSApp setHelpMenu:submenu];

diff --git a/lib/browser/api/menu-item-roles.js b/lib/browser/api/menu-item-roles.js
@@ -247,9 +247,7 @@ const roles = {
       { role: 'zoom' },
       ...(isMac ? [
         { type: 'separator' },
-        { role: 'front' },
-        { type: 'separator' },
-        { role: 'window' }
+        { role: 'front' }
       ] : [
         { role: 'close' }
       ])