Revision: 29106 http://sourceforge.net/p/bibdesk/svn/29106 Author: hofman Date: 2025-04-15 15:55:01 +0000 (Tue, 15 Apr 2025) Log Message: ----------- Check for copy operation first to avoid checking twice
Modified Paths: -------------- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m Modified: trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m =================================================================== --- trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m 2025-04-15 15:27:11 UTC (rev 29105) +++ trunk/bibdesk_vendorsrc/amaxwell/FileView/FVFileView.m 2025-04-15 15:55:01 UTC (rev 29106) @@ -2049,7 +2049,7 @@ aRect.size.height = 6.0; } else { aRect.origin.x -= _padding.width / 2 + 3.0; - aRect.size.width = 6.0; + aRect.size.width = 6.0; } } break; @@ -2815,13 +2815,17 @@ // We have to make sure the pasteboard really has a URL here, since most NSStrings aren't valid URLs, but the delegate may accept other types dragOp = NSDragOperationNone; } - else if ([self _isLocalDraggingInfo:sender] && isCopy == NO) { + else if (isCopy) { + // Should be a no-op + dragOp = NSDragOperationCopy; + } + else if ([self _isLocalDraggingInfo:sender]) { // invalidate some local drags, otherwise make sure we use a Move operation if (FVDropOn == dropOp) { // drop on the whole view (add operation) or an icon (replace operation) makes no sense for a local drag, but the delegate may override dragOp = NSDragOperationNone; } - else if (FVDropBefore == dropOp || FVDropAfter == dropOp) { + else { // inserting inside the block we're dragging doesn't make sense; this does allow dropping a disjoint selection at some locations within the selection; the delegate may override insertIndex = FVDropAfter == dropOp ? dropIndex + 1 : dropIndex; firstIndex = [_selectionIndexes firstIndex], endIndex = [_selectionIndexes lastIndex] + 1; @@ -2834,7 +2838,7 @@ } } } - else if (isCopy == NO) { + else { dragOp = NSDragOperationLink; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ Bibdesk-commit mailing list Bibdesk-commit@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/bibdesk-commit