Browse Source

tidy osx menu code

pull/2978/head
Dan Walmsley 7 years ago
parent
commit
7d1505e42e
  1. 11
      native/Avalonia.Native/src/OSX/menu.mm

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

@ -227,8 +227,6 @@ extern void SetAppMenu (NSString* appName, IAvnAppMenu* menu)
[currentMenu insertItem:s_appMenuItem atIndex:0]; [currentMenu insertItem:s_appMenuItem atIndex:0];
//[NSApp setMenu:nativeMenu->GetNative()];
auto appMenu = [s_appMenuItem submenu]; auto appMenu = [s_appMenuItem submenu];
[appMenu addItem:[NSMenuItem separatorItem]]; [appMenu addItem:[NSMenuItem separatorItem]];
@ -244,14 +242,14 @@ extern void SetAppMenu (NSString* appName, IAvnAppMenu* menu)
// Hide Application // Hide Application
auto hideItem = [[NSMenuItem alloc] initWithTitle:[@"Hide " stringByAppendingString:appName] action:@selector(hide:) keyEquivalent:@"h"]; auto hideItem = [[NSMenuItem alloc] initWithTitle:[@"Hide " stringByAppendingString:appName] action:@selector(hide:) keyEquivalent:@"h"];
//hideItem.target = self;
[appMenu addItem:hideItem]; [appMenu addItem:hideItem];
// Hide Others // Hide Others
auto hideAllOthersItem = [[NSMenuItem alloc] initWithTitle:@"Hide Others" auto hideAllOthersItem = [[NSMenuItem alloc] initWithTitle:@"Hide Others"
action:@selector(hideOtherApplications:) action:@selector(hideOtherApplications:)
keyEquivalent:@"h"]; keyEquivalent:@"h"];
//hideAllOthersItem.target = self;
hideAllOthersItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagOption; hideAllOthersItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | NSEventModifierFlagOption;
[appMenu addItem:hideAllOthersItem]; [appMenu addItem:hideAllOthersItem];
@ -259,7 +257,7 @@ extern void SetAppMenu (NSString* appName, IAvnAppMenu* menu)
auto showAllItem = [[NSMenuItem alloc] initWithTitle:@"Show All" auto showAllItem = [[NSMenuItem alloc] initWithTitle:@"Show All"
action:@selector(unhideAllApplications:) action:@selector(unhideAllApplications:)
keyEquivalent:@""]; keyEquivalent:@""];
//showAllItem.target = self;
[appMenu addItem:showAllItem]; [appMenu addItem:showAllItem];
[appMenu addItem:[NSMenuItem separatorItem]]; [appMenu addItem:[NSMenuItem separatorItem]];
@ -268,9 +266,6 @@ extern void SetAppMenu (NSString* appName, IAvnAppMenu* menu)
auto quitItem = [[NSMenuItem alloc] init]; auto quitItem = [[NSMenuItem alloc] init];
quitItem.title = [@"Quit " stringByAppendingString:appName]; quitItem.title = [@"Quit " stringByAppendingString:appName];
quitItem.keyEquivalent = @"q"; quitItem.keyEquivalent = @"q";
// This will remain true until synced with a QCocoaMenuItem.
// This way, we will always have a functional Quit menu item
// even if no QAction is added.
quitItem.action = @selector(terminate:); quitItem.action = @selector(terminate:);
[appMenu addItem:quitItem]; [appMenu addItem:quitItem];
} }

Loading…
Cancel
Save