ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-05-03 01:02:52 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Popovers now appear to work

Browse Source
This commit is contained in:
Grant Limberg 2017-03-27 10:55:47 -07:00
parent 683ba79ff0
commit 3d9a5a4f91
1 changed files with 94 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
macui/ZeroTier One/AppDelegate.m
View File

@ -114,9 +114,20 @@
} }
- (void)showNetworks { - (void)showNetworks {
if(self.statusItem.button != nil) { NSButton *button = nil;
NSStatusBarButton *button = self.statusItem.button; NSRect frame;
[self.networkListPopover showRelativeToRect:button.bounds if ([self.statusItem respondsToSelector:@selector(button)]) {
button = self.statusItem.button;
frame = button.bounds;
} else if ([self.statusItem respondsToSelector:@selector(_button)]) {
button = [self.statusItem performSelector:@selector(_button)];
frame = button.bounds;
} else {
NSLog(@"Can't get view. Uh oh.");
return;
}
[self.networkListPopover showRelativeToRect:frame
ofView:button ofView:button
preferredEdge:NSMinYEdge]; preferredEdge:NSMinYEdge];
@ -129,12 +140,22 @@
[self.networkListPopover close]; [self.networkListPopover close];
}]; }];
} }
}
} }
- (void)joinNetwork { - (void)joinNetwork {
if(self.statusItem.button != nil) { NSButton *button = nil;
NSStatusBarButton *button = self.statusItem.button; NSRect frame;
if ([self.statusItem respondsToSelector:@selector(button)]) {
button = self.statusItem.button;
frame = button.bounds;
} else if ([self.statusItem respondsToSelector:@selector(_button)]) {
button = [self.statusItem performSelector:@selector(_button)];
frame = button.bounds;
} else {
NSLog(@"Can't get view. Uh oh.");
return;
}
[self.joinNetworkPopover showRelativeToRect:button.bounds [self.joinNetworkPopover showRelativeToRect:button.bounds
ofView:button ofView:button
preferredEdge:NSMinYEdge]; preferredEdge:NSMinYEdge];
@ -147,12 +168,22 @@
[self.joinNetworkPopover close]; [self.joinNetworkPopover close];
}]; }];
} }
}
} }
- (void)showPreferences { - (void)showPreferences {
if(self.statusItem.button != nil) { NSButton *button = nil;
NSStatusBarButton *button = self.statusItem.button; NSRect frame;
if ([self.statusItem respondsToSelector:@selector(button)]) {
button = self.statusItem.button;
frame = button.bounds;
} else if ([self.statusItem respondsToSelector:@selector(_button)]) {
button = [self.statusItem performSelector:@selector(_button)];
frame = button.bounds;
} else {
NSLog(@"Can't get view. Uh oh.");
return;
}
[self.preferencesPopover showRelativeToRect:button.bounds [self.preferencesPopover showRelativeToRect:button.bounds
ofView:button ofView:button
preferredEdge:NSMinYEdge]; preferredEdge:NSMinYEdge];
@ -164,12 +195,22 @@
[self.preferencesPopover close]; [self.preferencesPopover close];
}]; }];
} }
}
} }
- (void)showAbout { - (void)showAbout {
if(self.statusItem.button != nil) { NSButton *button = nil;
NSStatusBarButton *button = self.statusItem.button; NSRect frame;
if ([self.statusItem respondsToSelector:@selector(button)]) {
button = self.statusItem.button;
frame = button.bounds;
} else if ([self.statusItem respondsToSelector:@selector(_button)]) {
button = [self.statusItem performSelector:@selector(_button)];
frame = button.bounds;
} else {
NSLog(@"Can't get view. Uh oh.");
return;
}
[self.aboutPopover showRelativeToRect:button.bounds [self.aboutPopover showRelativeToRect:button.bounds
ofView:button ofView:button
preferredEdge:NSMinYEdge]; preferredEdge:NSMinYEdge];
@ -181,8 +222,6 @@
[self.aboutPopover close]; [self.aboutPopover close];
}]; }];
} }
}
} }
- (void)quit { - (void)quit {