Yadciel/c_tray
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added nested menus for macos

Browse Source
This commit is contained in:
Serge A. Zaitsev
2017-01-12 13:31:17 +02:00
parent f0bdf44848
commit f71d2ba1d9
1 changed files with 31 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
tray.h
View File

@@ -104,10 +104,39 @@ static id statusBarButton;
- (void)menuCallback:(id)sender {
struct tray_menu *m =
(struct tray_menu *)[[sender representedObject] pointerValue];
m->cb(m);
if (m != NULL && m->cb != NULL) {
m->cb(m);
}
}
@end
static NSMenu *_tray_menu(struct tray_menu *m) {
NSMenu *menu = [NSMenu new];
[menu autorelease];
[menu setAutoenablesItems:NO];
for (; m != NULL && m->text != NULL; m++) {
if (strcmp(m->text, "-") == 0) {
[menu addItem:[NSMenuItem separatorItem]];
} else {
NSMenuItem *menuItem = [NSMenuItem alloc];
[menuItem autorelease];
[menuItem initWithTitle:[NSString stringWithUTF8String:m->text]
action:@selector(menuCallback:)
keyEquivalent:@""];
[menuItem setEnabled:(m->disabled ? NO : YES)];
[menuItem setState:(m->checked ? NSOnState : NSOffState)];
[menuItem setRepresentedObject:[NSValue valueWithPointer:m]];
[menu addItem:menuItem];
if (m->submenu != NULL) {
[menu setSubmenu:_tray_menu(m->submenu) forItem:menuItem];
}
}
}
return menu;
}
static int tray_init(struct tray *tray) {
pool = [NSAutoreleasePool new];
[NSApplication sharedApplication];
@@ -143,27 +172,7 @@ static void tray_update(struct tray *tray) {
[statusBarButton
setImage:[NSImage imageNamed:[NSString stringWithUTF8String:tray->icon]]];
NSMenu *menu = [NSMenu new];
[menu autorelease];
[menu setAutoenablesItems:NO];
for (struct tray_menu *m = tray->menu; m != NULL && m->text != NULL; m++) {
if (strcmp(m->text, "-") == 0) {
[menu addItem:[NSMenuItem separatorItem]];
} else {
NSMenuItem *menuItem = [NSMenuItem alloc];
[menuItem autorelease];
[menuItem initWithTitle:[NSString stringWithUTF8String:m->text]
action:@selector(menuCallback:)
keyEquivalent:@""];
[menuItem setEnabled:(m->disabled ? NO : YES)];
[menuItem setState:(m->checked ? NSOnState : NSOffState)];
[menuItem setRepresentedObject:[NSValue valueWithPointer:m]];
[menu addItem:menuItem];
}
}
[statusItem setMenu:menu];
[statusItem setMenu:_tray_menu(tray->menu)];
}
static void tray_exit() { [NSApp terminate:NSApp]; }