nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-14 23:52:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #208 from jamesrhurst/icon-chooser-fix

Browse Source 
Fixed bug with icon resetting to default after closing popover
This commit is contained in:
Michael Starke
2014-08-05 11:56:10 +02:00
parent 4a4692fb16 04a14931c6
commit 6ddce76b0d
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
MacPass/MPIconSelectViewController.m
View File

@@ -26,7 +26,7 @@ NSInteger const kMPDefaultIcon = -1;
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
if (self) { if (self) {
_didCancel = NO; _didCancel = YES;
} }
return self; return self;
} }
@@ -40,6 +40,7 @@ NSInteger const kMPDefaultIcon = -1;
} }
- (IBAction)useDefault:(id)sender { - (IBAction)useDefault:(id)sender {
self.didCancel = NO;
self.selectedIcon = kMPDefaultIcon; self.selectedIcon = kMPDefaultIcon;
[self.popover performClose:self]; [self.popover performClose:self];
} }
@@ -50,11 +51,12 @@ NSInteger const kMPDefaultIcon = -1;
} }
- (void)reset { - (void)reset {
self.didCancel = NO; self.didCancel = YES;
self.selectedIcon = kMPDefaultIcon; self.selectedIcon = kMPDefaultIcon;
} }
- (IBAction)_selectImage:(id)sender { - (IBAction)_selectImage:(id)sender {
self.didCancel = NO;
NSButton *button = sender; NSButton *button = sender;
NSImage *image = [button image]; NSImage *image = [button image];
NSUInteger buttonIndex = [[self.iconCollectionView content] indexOfObject:image]; NSUInteger buttonIndex = [[self.iconCollectionView content] indexOfObject:image];