[v2, darwin] Add some missing default shortcuts (#2586)

* [v2, darwin] Add "Hide, Hide Others, Show All“ to appmenu

This also includes shortcuts support for those commands.
Arrange the menu items in the well known MacOS order.

* [v2, darwin] Add Window menu with well known shortcuts Minimize, Full-Screen and Zoom.

v2/internal/frontend/desktop/darwin/Role.h

@@ -12,5 +12,6 @@ typedef int Role;
 
 static const Role AppMenu = 1;
 static const Role EditMenu = 2;
+static const Role WindowMenu = 3;
 
 #endif /* Role_h */

v2/internal/frontend/desktop/darwin/WailsMenu.m

@@ -68,12 +68,20 @@
                 appName = [[NSProcessInfo processInfo] processName];
             }
             WailsMenu *appMenu = [[[WailsMenu new] initWithNSTitle:appName] autorelease];
+            
+            if (ctx.aboutTitle != nil) {
+                [appMenu addItem:[self newMenuItemWithContext :ctx :[@"About " stringByAppendingString:appName] :@selector(About) :nil :0]];
+                [appMenu addItem:[NSMenuItem separatorItem]];
+            }
+
+            [appMenu addItem:[self newMenuItem:[@"Hide " stringByAppendingString:appName] :@selector(hide:) :@"h" :NSEventModifierFlagCommand]];
+            [appMenu addItem:[self newMenuItem:@"Hide Others" :@selector(hideOtherApplications:) :@"h" :(NSEventModifierFlagOption | NSEventModifierFlagCommand)]];
+            [appMenu addItem:[self newMenuItem:@"Show All" :@selector(unhideAllApplications:) :@""]];
+            [appMenu addItem:[NSMenuItem separatorItem]];
+
             id quitTitle = [@"Quit " stringByAppendingString:appName];
             NSMenuItem* quitMenuItem = [self newMenuItem:quitTitle :@selector(Quit) :@"q" :NSEventModifierFlagCommand];
             quitMenuItem.target = ctx;
-            if (ctx.aboutTitle != nil) {
-                [appMenu addItem:[self newMenuItemWithContext :ctx :[@"About " stringByAppendingString:appName] :@selector(About) :nil :0]];
-            }
             [appMenu addItem:quitMenuItem];
             [self appendSubmenu:appMenu];
             break;
@@ -100,6 +108,17 @@
             [editMenu appendSubmenu:speechMenu];
             [self appendSubmenu:editMenu];
             
+            break;
+        }
+        case WindowMenu:
+        {
+            WailsMenu *windowMenu = [[[WailsMenu new] initWithNSTitle:@"Window"] autorelease];
+            [windowMenu addItem:[self newMenuItem:@"Minimize" :@selector(performMiniaturize:) :@"m" :NSEventModifierFlagCommand]];
+            [windowMenu addItem:[self newMenuItem:@"Zoom" :@selector(performZoom:) :@""]];
+            [windowMenu addItem:[NSMenuItem separatorItem]];
+            [windowMenu addItem:[self newMenuItem:@"Full Screen" :@selector(enterFullScreenMode:) :@"f" :(NSEventModifierFlagControl | NSEventModifierFlagCommand)]];
+            [self appendSubmenu:windowMenu];
+            
             break;
         }
     }

v2/pkg/menu/menuroles.go

@@ -10,6 +10,7 @@ type Role int
 const (
 	AppMenuRole    Role = 1
 	EditMenuRole        = 2
+	WindowMenuRole      = 3
 	//AboutRole              Role = "about"
 	//UndoRole               Role = "undo"
 	//RedoRole               Role = "redo"
@@ -142,14 +143,16 @@ func ViewMenu() *MenuItem {
 		Role: ViewMenuRole,
 	}
 }
+*/
 
 // WindowMenu provides a MenuItem with the whole default "Window" menu (Minimize, Zoom, etc.).
+// On MacOS currently all options in there won't work if the window is frameless.
 func WindowMenu() *MenuItem {
 	return &MenuItem{
 		Role: WindowMenuRole,
 	}
 }
-*/
+
 // These roles are Mac only
 
 // AppMenu provides a MenuItem with the whole default "App" menu (About, Services, etc.)

v2/pkg/options/options.go

@@ -160,10 +160,14 @@ func processMenus(appoptions *App) {
 	switch runtime.GOOS {
 	case "darwin":
 		if appoptions.Menu == nil {
-			appoptions.Menu = menu.NewMenuFromItems(
-				menu.AppMenu(),
+			items := []*menu.MenuItem{
 				menu.EditMenu(),
-			)
+			}
+			if !appoptions.Frameless {
+				items = append(items, menu.WindowMenu()) // Current options in Window Menu only work if not frameless
+			}
+
+			appoptions.Menu = menu.NewMenuFromItems(menu.AppMenu(), items...)
 		}
 	}
 }

website/src/pages/changelog.mdx

@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added Nodejs version in `wails doctor`. Added by @misitebao in [PR](https://github.com/wailsapp/wails/pull/2546)
 - Added support for WebKit2GTK 2.40+ on Linux. This brings additional features for the [AssetServer](/docs/reference/options#assetserver), like support for HTTP Request Bodies. The app must be compiled with the Go build tag `webkit2_40` to activate support for this features. This also bumps the minimum requirement of WebKit2GTK to 2.40 for your app. Added by @stffabi in this [PR](https://github.com/wailsapp/wails/pull/2592)
+- macOS: Added Window menu role with well known shortcuts "Minimize, Full-Screen and Zoom". Added by @stffabi in [PR](https://github.com/wailsapp/wails/pull/2586)
+- macOS: Added "Hide, Hide Others, Show All“ to appmenu. Added by @stffabi in [PR](https://github.com/wailsapp/wails/pull/2586)
 
 ### Changed