gfwleak/zhangyang-zerotierone
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clicking "Join" to join a new network now properly closes the popover

Browse Source
This commit is contained in:
Grant Limberg
2016-10-17 13:43:27 -07:00
parent c44c3b0530
commit ed58467d12
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ZeroTier One/AppDelegate.m
View File

@@ -59,8 +59,9 @@
object:nil]; object:nil];
[self buildMenu]; [self buildMenu];
JoinNetworkViewController *jnvc = [[JoinNetworkViewController alloc] initWithNibName:@"JoinNetworkViewController" bundle:nil];
self.joinNetworkPopover.contentViewController = [[JoinNetworkViewController alloc] initWithNibName:@"JoinNetworkViewController" bundle:nil]; jnvc.appDelegate = self;
self.joinNetworkPopover.contentViewController = jnvc;
self.joinNetworkPopover.behavior = NSPopoverBehaviorTransient; self.joinNetworkPopover.behavior = NSPopoverBehaviorTransient;
ShowNetworksViewController *showNetworksView = [[ShowNetworksViewController alloc] initWithNibName:@"ShowNetworksViewController" bundle:nil]; ShowNetworksViewController *showNetworksView = [[ShowNetworksViewController alloc] initWithNibName:@"ShowNetworksViewController" bundle:nil];

3
ZeroTier One/JoinNetworkViewController.h
View File

@@ -11,6 +11,8 @@
extern NSString * const JoinedNetworksKey; extern NSString * const JoinedNetworksKey;
@class AppDelegate;
@interface JoinNetworkViewController : NSViewController <NSComboBoxDelegate, NSComboBoxDataSource> @interface JoinNetworkViewController : NSViewController <NSComboBoxDelegate, NSComboBoxDataSource>
@property (nonatomic, weak) IBOutlet NSComboBox *network; @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 *allowManagedCheckBox;
@property (nonatomic, weak) IBOutlet NSButton *allowGlobalCheckBox; @property (nonatomic, weak) IBOutlet NSButton *allowGlobalCheckBox;
@property (nonatomic, weak) IBOutlet NSButton *allowDefaultCheckBox; @property (nonatomic, weak) IBOutlet NSButton *allowDefaultCheckBox;
@property (nonatomic, weak) IBOutlet AppDelegate *appDelegate;
@property (nonatomic) NSMutableArray<NSString*> *values; @property (nonatomic) NSMutableArray<NSString*> *values;

4
ZeroTier One/JoinNetworkViewController.m
View File

@@ -8,7 +8,7 @@
#import "JoinNetworkViewController.h" #import "JoinNetworkViewController.h"
#import "ServiceCom.h" #import "ServiceCom.h"
#import "AppDelegate.h"
NSString * const JoinedNetworksKey = @"com.zerotier.one.joined-networks"; NSString * const JoinedNetworksKey = @"com.zerotier.one.joined-networks";
@@ -92,6 +92,8 @@ NSString * const JoinedNetworksKey = @"com.zerotier.one.joined-networks";
[self.values removeLastObject]; [self.values removeLastObject];
} }
} }
[self.appDelegate closeJoinNetworkPopover];
} }
// NSComboBoxDelegate methods // NSComboBoxDelegate methods