[macOS] Improve drag-drop events (#273)

qmk · Jul 6, 2021 · d85bb9e · d85bb9e
1 parent 313e257
commit d85bb9e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -280,7 +280,7 @@ xcuserdata
 # you should judge for yourself, the pros and cons are mentioned at:
 # https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
 #
-# Pods/
+Pods/
 
 # Carthage
 #

diff --git a/macos/QMK Toolbox.xcodeproj/project.pbxproj b/macos/QMK Toolbox.xcodeproj/project.pbxproj
@@ -386,7 +386,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/QMK Toolbox",
+					"\"$(PROJECT_DIR)/QMK Toolbox\"",
 					"$(PROJECT_DIR)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = fm.qmk.toolbox;
@@ -407,7 +407,7 @@
 				);
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/QMK Toolbox",
+					"\"$(PROJECT_DIR)/QMK Toolbox\"",
 					"$(PROJECT_DIR)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = fm.qmk.toolbox;

diff --git a/macos/QMK Toolbox.xcodeproj/xcshareddata/xcschemes/QMK Toolbox.xcscheme b/macos/QMK Toolbox.xcodeproj/xcshareddata/xcschemes/QMK Toolbox.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1200"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -40,9 +40,9 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"

diff --git a/macos/QMK Toolbox/QMKWindow.m b/macos/QMK Toolbox/QMKWindow.m
@@ -12,50 +12,29 @@ @implementation QMKWindow
 
 - (void)setup {
     [self registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]];
-//    [self registerForDraggedTypes:[NSArray arrayWithObjects:
-//        NSCreateFileContentsPboardType(@"qmk"),
-//        NSCreateFileContentsPboardType(@"hex"),
-//        NSCreateFileContentsPboardType(@"bin"),
-//    nil]];
 };
 
 - (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender {
-    NSPasteboard *pboard;
-    NSDragOperation sourceDragMask;
+    NSPasteboard *pboard = [sender draggingPasteboard];
 
-    sourceDragMask = [sender draggingSourceOperationMask];
-    pboard = [sender draggingPasteboard];
+    if ([[pboard types] containsObject:NSFilenamesPboardType]) {
+        if ([[pboard pasteboardItems] count] == 1) {
+            NSString *file = [pboard propertyListForType:NSFilenamesPboardType][0];
+            NSString * fileExtension = [[file pathExtension] lowercaseString];
 
-    if ( [[pboard types] containsObject:NSFilenamesPboardType] ) {
-        if (sourceDragMask & NSDragOperationLink) {
-            return NSDragOperationLink;
+            if ([fileExtension isEqualToString:@"qmk"] || [fileExtension isEqualToString:@"hex"] || [fileExtension isEqualToString:@"bin"]) {
+                return NSDragOperationCopy;
+            }
         }
     }
 
     return NSDragOperationNone;
 }
 
 - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender {
-    NSPasteboard *pboard;
-    NSDragOperation sourceDragMask;
-
-    sourceDragMask = [sender draggingSourceOperationMask];
-    pboard = [sender draggingPasteboard];
-
-    NSArray *files = [pboard propertyListForType:NSFilenamesPboardType];
-    for (NSString * file in files) {
-        if ([[[file pathExtension] lowercaseString] isEqualToString:@"qmk"] ||
-            [[[file pathExtension] lowercaseString] isEqualToString:@"hex"] ||
-            [[[file pathExtension] lowercaseString] isEqualToString:@"bin"]) {
-            [(AppDelegate *)[[NSApplication sharedApplication] delegate] setFilePath:[NSURL URLWithString:file]];
-        } else {
-            NSAlert *alert = [[NSAlert alloc] init];
-
-            [alert setMessageText:@"This file format isn't supported"];
-            [alert addButtonWithTitle:@"Sorry"];
-            [alert runModal];
-        }
-    }
+    NSPasteboard *pboard = [sender draggingPasteboard];
+    NSString *file = [pboard propertyListForType:NSFilenamesPboardType][0];
+    [(AppDelegate *)[[NSApplication sharedApplication] delegate] setFilePath:[NSURL fileURLWithPath:file]];
     return YES;
 }