Allow dragging a folder on the Welcome window to open a repository - Closes #468 and #247 #469
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| // Copyright (C) 2015-2018 Pierre-Olivier Latour <info@pol-online.net> | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| #import <Cocoa/Cocoa.h> | ||
|
|
||
| @interface DragAndDropImageView : NSImageView <NSDraggingDestination> | ||
|
|
||
| @end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,107 @@ | ||
| // Copyright (C) 2015-2018 Pierre-Olivier Latour <info@pol-online.net> | ||
| // | ||
| // This program is free software: you can redistribute it and/or modify | ||
| // it under the terms of the GNU General Public License as published by | ||
| // the Free Software Foundation, either version 3 of the License, or | ||
| // (at your option) any later version. | ||
| // | ||
| // This program is distributed in the hope that it will be useful, | ||
| // but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| // GNU General Public License for more details. | ||
| // | ||
| // You should have received a copy of the GNU General Public License | ||
| // along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
|
|
||
| #import "DragAndDropImageView.h" | ||
| #import "AppDelegate.h" | ||
|
|
||
| @interface DragAndDropImageView() | ||
| @property (nonatomic, assign) BOOL isHighlighted; | ||
| @end | ||
|
|
||
| @implementation DragAndDropImageView | ||
|
|
||
| - (void)awakeFromNib { | ||
| [super awakeFromNib]; | ||
| [self registerForDraggedTypes:@[NSFilenamesPboardType]]; | ||
| } | ||
|
|
||
| - (void)dealloc { | ||
| [self unregisterDraggedTypes]; | ||
| } | ||
|
|
||
| - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender { | ||
| BOOL isDragOperationGeneric = (NSDragOperationGeneric & [sender draggingSourceOperationMask]) == NSDragOperationGeneric; | ||
| NSPasteboard *pasteboard = [sender draggingPasteboard]; | ||
| if (isDragOperationGeneric && [self directoryURLFromPasteboard:pasteboard]) { | ||
|
There was a problem hiding this comment. On modern macOS, drag operations should be validated using the multi-contents support of Here, that would be: [pasteboard canReadObjectForClasses:@[ NSURL.class ] options:@{
NSPasteboardURLReadingFileURLsOnlyKey: @YES,
NSPasteboardURLReadingContentsConformToTypesKey: @[
(__bridge id)kUTTypeDirectory
]
}] |
||
| self.isHighlighted = YES; | ||
| return NSDragOperationGeneric; | ||
| } else { | ||
| return NSDragOperationNone; | ||
| } | ||
| } | ||
|
|
||
| - (void)draggingExited:(id<NSDraggingInfo>)sender { | ||
| self.isHighlighted = NO; | ||
| } | ||
|
|
||
| - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender { | ||
| NSPasteboard *pasteboard = [sender draggingPasteboard]; | ||
| NSURL *directoryURL = [self directoryURLFromPasteboard:pasteboard]; | ||
|
There was a problem hiding this comment. On modern macOS, drag operations should be performed using the multi-contents support of Here, that would be: NSArray* urls = [pasteboard readObjectsForClasses:@[ NSURL.class ] options:@{
NSPasteboardURLReadingFileURLsOnlyKey: @YES,
NSPasteboardURLReadingContentsConformToTypesKey: @[
(__bridge id)kUTTypeDirectory
]
}] |
||
| if (directoryURL) { | ||
| AppDelegate *appDelegate = (AppDelegate *)[[NSApplication sharedApplication] delegate]; | ||
| [appDelegate openRepositoryWithURL:directoryURL]; | ||
| return YES; | ||
| } else { | ||
| return NO; | ||
| } | ||
| } | ||
|
|
||
| - (void)concludeDragOperation:(id<NSDraggingInfo>)sender { | ||
| self.isHighlighted = NO; | ||
| } | ||
|
|
||
| - (void)drawRect:(NSRect)dirtyRect { | ||
| [super drawRect:dirtyRect]; | ||
|
|
||
| if (self.isHighlighted) { | ||
| NSBezierPath *path = [NSBezierPath bezierPathWithRoundedRect:dirtyRect xRadius:10 yRadius:10]; | ||
|
There was a problem hiding this comment.
|
||
| // systemBlueColor from https://developer.apple.com/design/human-interface-guidelines/macos/visual-design/color/ | ||
| NSColor *higlightColor = [NSColor colorWithRed:27.0/255.0 | ||
|
There was a problem hiding this comment. Typo in name, and also, perhaps better to use There was a problem hiding this comment.
|
||
| green:173.0/255.0 | ||
| blue:248.0/255.0 | ||
| alpha:0.2]; | ||
| [higlightColor set]; | ||
| [path fill]; | ||
| } | ||
| } | ||
|
|
||
| #pragma mark - | ||
|
|
||
| // Returns first directory URL from the given pasteboard | ||
| - (NSURL *)directoryURLFromPasteboard:(NSPasteboard *)pasteboard { | ||
| NSString *desiredType = [pasteboard availableTypeFromArray:@[NSFilenamesPboardType]]; | ||
| if (![desiredType isEqualToString:NSFilenamesPboardType]) { | ||
| return nil; | ||
| } | ||
| NSArray *filenames = [pasteboard propertyListForType:NSFilenamesPboardType]; | ||
| NSURL *url = [NSURL fileURLWithPath:[filenames firstObject]]; | ||
| NSFileManager *fileManager = [NSFileManager defaultManager]; | ||
| BOOL isDirectory = NO; | ||
| if ([fileManager fileExistsAtPath:[url path] isDirectory:&isDirectory] && isDirectory) { | ||
| return url; | ||
| } else { | ||
| return nil; | ||
| } | ||
| } | ||
|
|
||
| - (void)setIsHighlighted:(BOOL)isHighlighted { | ||
| if (_isHighlighted != isHighlighted) { | ||
| _isHighlighted = isHighlighted; | ||
|
|
||
| [self setNeedsDisplay:YES]; | ||
| } | ||
| } | ||
|
|
||
| @end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
On modern macOS, drag support should be registered either using one of the non-deprecated pasteboard types (post-10.14) or a UTI. Here, use
@[ (__bridge id)kUTTypeFileURL ]orNSURL.readableTypeIdentifiersForItemProvider, whichever you prefer.