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

Using NSViewController presentation instead of manual NSPopup creation

Browse Source
This commit is contained in:
Michael Starke
2018-11-05 17:36:32 +01:00
parent d6b95118da
commit 1ed35a6eab
10 changed files with 40 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MacPass/MPIconSelectViewController.m
View File

@@ -86,7 +86,7 @@ typedef NS_ENUM(NSInteger, MPIconDownloadStatus) {
node.iconId = [node.class defaultIcon];
node.iconUUID = nil;
[self.observer didChangeModelProperty];
[self.view.window performClose:sender];
[self dismissController:sender];
}
- (IBAction)downloadIcon:(id)sender {
@@ -168,7 +168,7 @@ typedef NS_ENUM(NSInteger, MPIconDownloadStatus) {
}
- (IBAction)cancel:(id)sender {
[self.view.window performClose:sender];
[self dismissController:sender];
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
@@ -186,15 +186,6 @@ typedef NS_ENUM(NSInteger, MPIconDownloadStatus) {
return NO;
}
- (void)didSelectCollectionViewItem:(id)sender {
if(![sender isKindOfClass:[NSCollectionViewItem class]]) {
return;
}
NSCollectionViewItem *item = sender;
NSLog(@"selected item.frame: %@", NSStringFromRect(item.view.frame));
//[self _selectIcon:item.representedObject];
}
- (void)_selectIcon:(KPKIcon *)icon {
KPKNode *node = self.representedObject;
NSUInteger iconIndex = [self.iconCollectionView.content indexOfObject:icon];
@@ -210,7 +201,7 @@ typedef NS_ENUM(NSInteger, MPIconDownloadStatus) {
node.iconUUID = nil;
}
[self.observer didChangeModelProperty];
[self.view.window performClose:nil];
[self dismissController:nil];
}
- (NSDragOperation)collectionView:(NSCollectionView *)collectionView validateDrop:(id <NSDraggingInfo>)draggingInfo proposedIndex:(NSInteger *)proposedDropIndex dropOperation:(NSCollectionViewDropOperation *)proposedDropOperation {
@@ -225,7 +216,7 @@ typedef NS_ENUM(NSInteger, MPIconDownloadStatus) {
return NO;
}
BOOL success = NO;
MPDocument *document = [NSDocumentController sharedDocumentController].currentDocument;
MPDocument *document = NSDocumentController.sharedDocumentController.currentDocument;
for(NSURL *url in urls) {
KPKIcon *icon = [[KPKIcon alloc] initWithImageAtURL:url];
if(icon.image) {