diff options
| author | Grant Limberg <grant.limberg@zerotier.com> | 2016-10-17 13:43:27 -0700 |
|---|---|---|
| committer | Grant Limberg <grant.limberg@zerotier.com> | 2016-10-17 13:43:27 -0700 |
| commit | ed58467d12914a9be53e47060cf148ab218b499a (patch) | |
| tree | b6f0340379abfd33cafd5aa26eabf42adbd3ea2a | |
| parent | c44c3b053030d57afaf70790e82e69d14c736a83 (diff) | |
| download | infinitytier-ed58467d12914a9be53e47060cf148ab218b499a.tar.gz infinitytier-ed58467d12914a9be53e47060cf148ab218b499a.zip | |
Clicking "Join" to join a new network now properly closes the popover
| -rw-r--r-- | ZeroTier One/AppDelegate.m | 5 | ||||
| -rw-r--r-- | ZeroTier One/JoinNetworkViewController.h | 3 | ||||
| -rw-r--r-- | ZeroTier One/JoinNetworkViewController.m | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/ZeroTier One/AppDelegate.m b/ZeroTier One/AppDelegate.m index 9adbaa98..86c83367 100644 --- a/ZeroTier One/AppDelegate.m +++ b/ZeroTier One/AppDelegate.m @@ -59,8 +59,9 @@ object:nil]; [self buildMenu]; - - self.joinNetworkPopover.contentViewController = [[JoinNetworkViewController alloc] initWithNibName:@"JoinNetworkViewController" bundle:nil]; + JoinNetworkViewController *jnvc = [[JoinNetworkViewController alloc] initWithNibName:@"JoinNetworkViewController" bundle:nil]; + jnvc.appDelegate = self; + self.joinNetworkPopover.contentViewController = jnvc; self.joinNetworkPopover.behavior = NSPopoverBehaviorTransient; ShowNetworksViewController *showNetworksView = [[ShowNetworksViewController alloc] initWithNibName:@"ShowNetworksViewController" bundle:nil]; diff --git a/ZeroTier One/JoinNetworkViewController.h b/ZeroTier One/JoinNetworkViewController.h index 894b4ec2..a928d046 100644 --- a/ZeroTier One/JoinNetworkViewController.h +++ b/ZeroTier One/JoinNetworkViewController.h @@ -11,6 +11,8 @@ extern NSString * const JoinedNetworksKey; +@class AppDelegate; + @interface JoinNetworkViewController : NSViewController <NSComboBoxDelegate, NSComboBoxDataSource> @property (nonatomic, weak) IBOutlet NSComboBox *network; @@ -18,6 +20,7 @@ extern NSString * const JoinedNetworksKey; @property (nonatomic, weak) IBOutlet NSButton *allowManagedCheckBox; @property (nonatomic, weak) IBOutlet NSButton *allowGlobalCheckBox; @property (nonatomic, weak) IBOutlet NSButton *allowDefaultCheckBox; +@property (nonatomic, weak) IBOutlet AppDelegate *appDelegate; @property (nonatomic) NSMutableArray<NSString*> *values; diff --git a/ZeroTier One/JoinNetworkViewController.m b/ZeroTier One/JoinNetworkViewController.m index d51f7de0..abe8f959 100644 --- a/ZeroTier One/JoinNetworkViewController.m +++ b/ZeroTier One/JoinNetworkViewController.m @@ -8,7 +8,7 @@ #import "JoinNetworkViewController.h" #import "ServiceCom.h" - +#import "AppDelegate.h" NSString * const JoinedNetworksKey = @"com.zerotier.one.joined-networks"; @@ -92,6 +92,8 @@ NSString * const JoinedNetworksKey = @"com.zerotier.one.joined-networks"; [self.values removeLastObject]; } } + + [self.appDelegate closeJoinNetworkPopover]; } // NSComboBoxDelegate methods |