Merge pull request #5597 from AvaloniaUI/allow-disabling-default-appmenu-items-osx

allow user to disable generation of default appmenu items on osx.

native/Avalonia.Native/src/OSX/common.h

@@ -28,6 +28,8 @@ extern IAvnNativeControlHost* CreateNativeControlHost(NSView* parent);
 extern void SetAppMenu (NSString* appName, IAvnMenu* appMenu);
 extern IAvnMenu* GetAppMenu ();
 extern NSMenuItem* GetAppMenuItem ();
+extern void SetAutoGenerateDefaultAppMenuItems (bool enabled);
+extern bool GetAutoGenerateDefaultAppMenuItems ();
 
 extern void InitializeAvnApp();
 extern NSApplicationActivationPolicy AvnDesiredActivationPolicy;

native/Avalonia.Native/src/OSX/main.mm

@@ -2,6 +2,7 @@
 #define COM_GUIDS_MATERIALIZE
 #include "common.h"
 
+static bool s_generateDefaultAppMenuItems = true;
 static NSString* s_appTitle = @"Avalonia";
 
 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
@@ -122,6 +123,12 @@ public:
             ? NSApplicationActivationPolicyRegular : NSApplicationActivationPolicyAccessory;
         return S_OK;
     }
+    
+    virtual HRESULT SetDisableDefaultApplicationMenuItems (bool enabled) override
+    {
+        SetAutoGenerateDefaultAppMenuItems(!enabled);
+        return S_OK;
+    }
 };
 
 /// See "Using POSIX Threads in a Cocoa Application" section here:
@@ -310,3 +317,13 @@ CGFloat PrimaryDisplayHeight()
 {
   return NSMaxY([[[NSScreen screens] firstObject] frame]);
 }
+
+void SetAutoGenerateDefaultAppMenuItems (bool enabled)
+{
+    s_generateDefaultAppMenuItems = enabled;
+}
+
+bool GetAutoGenerateDefaultAppMenuItems ()
+{
+    return s_generateDefaultAppMenuItems;
+}

native/Avalonia.Native/src/OSX/menu.mm

@@ -445,47 +445,50 @@ extern void SetAppMenu (NSString* appName, IAvnMenu* menu)
         
         auto appMenu  = [s_appMenuItem submenu];
         
-        [appMenu addItem:[NSMenuItem separatorItem]];
+        if(GetAutoGenerateDefaultAppMenuItems())
-        
+        {
-        // Services item and menu
+            [appMenu addItem:[NSMenuItem separatorItem]];
-        auto servicesItem = [[NSMenuItem alloc] init];
+            
-        servicesItem.title = @"Services";
+            // Services item and menu
-        NSMenu *servicesMenu = [[NSMenu alloc] initWithTitle:@"Services"];
+            auto servicesItem = [[NSMenuItem alloc] init];
-        servicesItem.submenu = servicesMenu;
+            servicesItem.title = @"Services";
-        [NSApplication sharedApplication].servicesMenu = servicesMenu;
+            NSMenu *servicesMenu = [[NSMenu alloc] initWithTitle:@"Services"];
-        [appMenu addItem:servicesItem];
+            servicesItem.submenu = servicesMenu;
-        
+            [NSApplication sharedApplication].servicesMenu = servicesMenu;
-        [appMenu addItem:[NSMenuItem separatorItem]];
+            [appMenu addItem:servicesItem];
-        
+            
-        // Hide Application
+            [appMenu addItem:[NSMenuItem separatorItem]];
-        auto hideItem = [[NSMenuItem alloc] initWithTitle:[@"Hide " stringByAppendingString:appName] action:@selector(hide:) keyEquivalent:@"h"];
+            
-        
+            // Hide Application
-        [appMenu addItem:hideItem];
+            auto hideItem = [[NSMenuItem alloc] initWithTitle:[@"Hide " stringByAppendingString:appName] action:@selector(hide:) keyEquivalent:@"h"];
-        
+            
-        // Hide Others
+            [appMenu addItem:hideItem];
-        auto hideAllOthersItem = [[NSMenuItem alloc] initWithTitle:@"Hide Others"
+            
-                                                       action:@selector(hideOtherApplications:)
+            // Hide Others
-                                                keyEquivalent:@"h"];
+            auto hideAllOthersItem = [[NSMenuItem alloc] initWithTitle:@"Hide Others"
-        
+                                                           action:@selector(hideOtherApplications:)
-        hideAllOthersItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagOption;
+                                                    keyEquivalent:@"h"];
-        [appMenu addItem:hideAllOthersItem];
+            
-        
+            hideAllOthersItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagOption;
-        // Show All
+            [appMenu addItem:hideAllOthersItem];
-        auto showAllItem = [[NSMenuItem alloc] initWithTitle:@"Show All"
+            
-                                                 action:@selector(unhideAllApplications:)
+            // Show All
-                                          keyEquivalent:@""];
+            auto showAllItem = [[NSMenuItem alloc] initWithTitle:@"Show All"
-        
+                                                     action:@selector(unhideAllApplications:)
-        [appMenu addItem:showAllItem];
+                                              keyEquivalent:@""];
-        
+            
-        [appMenu addItem:[NSMenuItem separatorItem]];
+            [appMenu addItem:showAllItem];
-        
+            
-        // Quit Application
+            [appMenu addItem:[NSMenuItem separatorItem]];
-        auto quitItem = [[NSMenuItem alloc] init];
+            
-        quitItem.title = [@"Quit " stringByAppendingString:appName];
+            // Quit Application
-        quitItem.keyEquivalent = @"q";
+            auto quitItem = [[NSMenuItem alloc] init];
-        quitItem.target = [AvnWindow class];
+            quitItem.title = [@"Quit " stringByAppendingString:appName];
-        quitItem.action = @selector(closeAll);
+            quitItem.keyEquivalent = @"q";
-        [appMenu addItem:quitItem];
+            quitItem.target = [AvnWindow class];
+            quitItem.action = @selector(closeAll);
+            [appMenu addItem:quitItem];
+        }
     }
     else
     {

src/Avalonia.Native/AvaloniaNativePlatform.cs

@@ -92,6 +92,8 @@ namespace Avalonia.Native
                 var macOpts = AvaloniaLocator.Current.GetService<MacOSPlatformOptions>();
 
                 _factory.MacOptions.SetShowInDock(macOpts?.ShowInDock != false ? 1 : 0);
+                _factory.MacOptions.SetDisableDefaultApplicationMenuItems(
+                    macOpts?.DisableDefaultApplicationMenuItems == true ? 1 : 0);
             }
 
             AvaloniaLocator.CurrentMutable

src/Avalonia.Native/AvaloniaNativePlatformExtensions.cs

@@ -38,5 +38,7 @@ namespace Avalonia
     public class MacOSPlatformOptions
     {
         public bool ShowInDock { get; set; } = true;
+        
+        public bool DisableDefaultApplicationMenuItems { get; set; }
     }
 }

src/Avalonia.Native/avn.idl

@@ -528,6 +528,7 @@ interface IAvnMacOptions : IUnknown
 {
      HRESULT SetShowInDock(int show);
      HRESULT SetApplicationTitle(char* utf8string);
+     HRESULT SetDisableDefaultApplicationMenuItems(bool enabled);
 }
 
 [uuid(04c1b049-1f43-418a-9159-cae627ec1367)]