Mac clipboard: don't create a new dragboard for private-only drags

livecodefraser · livecodefraser · commit 7b43c27e82a7 · 2015-11-24T15:30:55.000Z
It isn't needed - we can do this using the main dragboard.
diff --git a/engine/src/desktop.cpp b/engine/src/desktop.cpp
@@ -556,6 +556,12 @@ void MCPlatformHandleDragDrop(MCPlatformWindowRef p_window, bool& r_accepted)
 {
 	MCdispatcher -> wmdragdrop(p_window);
 	
+    // On some platforms (Mac and iOS), the drag board used for drag-and-drop
+    // operations may not be the main drag board. Reset the drag board back to
+    // the main one after the drag has left.
+    MCAutoRefcounted<MCRawClipboard> t_dragboard(MCRawClipboard::CreateSystemDragboard());
+    MCdragboard->Rebind(t_dragboard);
+    
 	// PLATFORM-TODO: Should we do more than this? i.e. Should the dragDrop
 	//   message be able to signal refusal?
 	r_accepted = true;
diff --git a/engine/src/mac-pasteboard.mm b/engine/src/mac-pasteboard.mm
@@ -87,14 +87,9 @@ void MCPlatformDoDragDrop(MCPlatformWindowRef p_window, MCPlatformAllowedDragOpe
     // This is required as the OSX drag-and-drop loop requires a pasteboard to
     // be specified.
     NSPasteboard *t_pboard;
-    bool t_is_private;
-    t_is_private = false;
     t_pboard = [NSPasteboard pasteboardWithName: NSDragPboard];
     if ([[t_pboard pasteboardItems] count] == 0)
     {
-        t_is_private = true;
-        t_pboard = [NSPasteboard pasteboardWithUniqueName];
-        
         NSPasteboardItem *t_item;
         t_item = [[[NSPasteboardItem alloc] init] autorelease];
         [t_item setString: @"" forType: @"com.runrev.livecode.private"];
@@ -105,9 +100,6 @@ void MCPlatformDoDragDrop(MCPlatformWindowRef p_window, MCPlatformAllowedDragOpe
     
 	NSDragOperation t_op;
 	t_op = [((MCMacPlatformWindow *)p_window) -> GetView() dragImage: t_image offset: t_image_loc allowing: t_allowed_operations pasteboard: t_pboard];
-	
-    if (t_is_private)
-        [t_pboard releaseGlobally];
     
 	[t_image release];
 	
diff --git a/engine/src/mac-window.mm b/engine/src/mac-window.mm
@@ -1359,8 +1359,11 @@ - (BOOL)wantsPeriodicDraggingUpdates
 
 - (NSDragOperation)draggingEntered: (id<NSDraggingInfo>)sender
 {
-    // Create a wrapper around the drag board for this operation
-    MCAutoRefcounted<MCMacRawClipboard> t_dragboard = new MCMacRawClipboard([sender draggingPasteboard]);
+    // Create a wrapper around the drag board for this operation if the drag
+    // source is outside this instance of LiveCode.
+    MCAutoRefcounted<MCMacRawClipboard> t_dragboard;
+    if ([sender draggingSource] != nil)
+        t_dragboard = new MCMacRawClipboard([sender draggingPasteboard]);
     
 	NSDragOperation t_ns_operation;
 	
