interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switched from manually enabling menu items on OS X to automatic enabling, just like with the application menu. Same code :/ Also cleaned up useless [NSMenuItem setEnabled:] calls.

This commit is contained in:
Pietro Gagliardi 2015-05-03 21:37:45 -04:00
parent 82312861e9
commit 4ba0f795eb
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
darwin/menu.m
View File

@ -129,7 +129,6 @@ enum {
title = [@"About " stringByAppendingString:appName]; title = [@"About " stringByAppendingString:appName];
item = [[NSMenuItem alloc] initWithTitle:title action:@selector(onClicked:) keyEquivalent:@""]; item = [[NSMenuItem alloc] initWithTitle:title action:@selector(onClicked:) keyEquivalent:@""];
[item setTarget:self]; [item setTarget:self];
[item setEnabled:NO];
[appMenu addItem:item]; [appMenu addItem:item];
self.aboutItem = item; self.aboutItem = item;
@ -138,7 +137,6 @@ enum {
// next is Preferences // next is Preferences
item = [[NSMenuItem alloc] initWithTitle:@"Preferences…" action:@selector(onClicked:) keyEquivalent:@","]; item = [[NSMenuItem alloc] initWithTitle:@"Preferences…" action:@selector(onClicked:) keyEquivalent:@","];
[item setTarget:self]; [item setTarget:self];
[item setEnabled:NO];
[appMenu addItem:item]; [appMenu addItem:item];
self.preferencesItem = item; self.preferencesItem = item;
@ -172,7 +170,6 @@ enum {
title = [@"Quit " stringByAppendingString:appName]; title = [@"Quit " stringByAppendingString:appName];
item = [[NSMenuItem alloc] initWithTitle:title action:@selector(onClicked:) keyEquivalent:@"q"]; item = [[NSMenuItem alloc] initWithTitle:title action:@selector(onClicked:) keyEquivalent:@"q"];
[item setTarget:self]; [item setTarget:self];
[item setEnabled:NO];
[appMenu addItem:item]; [appMenu addItem:item];
self.quitItem = item; self.quitItem = item;
} }
@ -197,8 +194,6 @@ static void menuItemEnable(uiMenuItem *ii)
{ {
struct menuItem *item = (struct menuItem *) ii; struct menuItem *item = (struct menuItem *) ii;
// TODO get rid of this entirely and just use the validation
[item->item setEnabled:YES];
item->disabled = NO; item->disabled = NO;
// we don't need to explicitly update the menus here; they'll be updated the next time they're opened (thanks mikeash in irc.freenode.net/#macdev) // we don't need to explicitly update the menus here; they'll be updated the next time they're opened (thanks mikeash in irc.freenode.net/#macdev)
} }
@ -207,7 +202,6 @@ static void menuItemDisable(uiMenuItem *ii)
{ {
struct menuItem *item = (struct menuItem *) ii; struct menuItem *item = (struct menuItem *) ii;
[item->item setEnabled:NO];
item->disabled = YES; item->disabled = YES;
} }
@ -250,15 +244,12 @@ static uiMenuItem *newItem(struct menu *m, int type, const char *name)
switch (item->type) { switch (item->type) {
case typeQuit: case typeQuit:
item->item = appDelegate().menuManager.quitItem; item->item = appDelegate().menuManager.quitItem;
[item->item setEnabled:YES];
break; break;
case typePreferences: case typePreferences:
item->item = appDelegate().menuManager.preferencesItem; item->item = appDelegate().menuManager.preferencesItem;
[item->item setEnabled:YES];
break; break;
case typeAbout: case typeAbout:
item->item = appDelegate().menuManager.aboutItem; item->item = appDelegate().menuManager.aboutItem;
[item->item setEnabled:YES];
break; break;
case typeSeparator: case typeSeparator:
item->item = [NSMenuItem separatorItem]; item->item = [NSMenuItem separatorItem];
@ -326,7 +317,7 @@ uiMenu *uiNewMenu(const char *name)
m = uiNew(struct menu); m = uiNew(struct menu);
m->menu = [[NSMenu alloc] initWithTitle:toNSString(name)]; m->menu = [[NSMenu alloc] initWithTitle:toNSString(name)];
[m->menu setAutoenablesItems:NO]; // use automatic menu item enabling for all menus for consistency's sake
m->item = [[NSMenuItem alloc] initWithTitle:toNSString(name) action:NULL keyEquivalent:@""]; m->item = [[NSMenuItem alloc] initWithTitle:toNSString(name) action:NULL keyEquivalent:@""];
[m->item setSubmenu:m->menu]; [m->item setSubmenu:m->menu];