Revision: 26744
http://sourceforge.net/p/bibdesk/svn/26744
Author: hofman
Date: 2021-08-26 09:30:34 +0000 (Thu, 26 Aug 2021)
Log Message:
-----------
Draw bitmap of self as drag image for drag image view by default
Modified Paths:
--------------
trunk/bibdesk/BDSKAddressTextField.m
trunk/bibdesk/BDSKDragImageView.m
Modified: trunk/bibdesk/BDSKAddressTextField.m
===================================================================
--- trunk/bibdesk/BDSKAddressTextField.m 2021-08-26 09:22:59 UTC (rev
26743)
+++ trunk/bibdesk/BDSKAddressTextField.m 2021-08-26 09:30:34 UTC (rev
26744)
@@ -186,14 +186,6 @@
return url ? [NSArray arrayWithObject:url] : nil;
}
-- (NSImage *)dragImageForDragImageView:(BDSKDragImageView *)view {
- NSImage *dragImage = [[[NSImage alloc] initWithSize:[view frame].size]
autorelease];
- NSBitmapImageRep *imageRep = [view
bitmapImageRepForCachingDisplayInRect:[view bounds]];
- [view cacheDisplayInRect:[view bounds] toBitmapImageRep:imageRep];
- [dragImage addRepresentation:imageRep];
- return dragImage;
-}
-
- (NSDragOperation)dragImageView:(BDSKDragImageView *)view
sourceOperationMaskForDraggingContext:(NSDraggingContext)context {
return NSDragOperationCopy | NSDragOperationLink | NSDragOperationGeneric
| NSDragOperationPrivate;
}
Modified: trunk/bibdesk/BDSKDragImageView.m
===================================================================
--- trunk/bibdesk/BDSKDragImageView.m 2021-08-26 09:22:59 UTC (rev 26743)
+++ trunk/bibdesk/BDSKDragImageView.m 2021-08-26 09:30:34 UTC (rev 26744)
@@ -131,13 +131,16 @@
NSImage *dragImage = nil;
NSRect imageRect = NSZeroRect;
- if ([delegate
respondsToSelector:@selector(dragImageForDragImageView:)]) {
+ if ([delegate
respondsToSelector:@selector(dragImageForDragImageView:)])
dragImage = [delegate
dragImageForDragImageView:self];
- imageRect.size = [dragImage size];
+ if (dragImage == nil) {
+ dragImage = [[[NSImage alloc]
initWithSize:[self bounds].size] autorelease];
+ NSBitmapImageRep *imageRep = [self
bitmapImageRepForCachingDisplayInRect:[self bounds]];
+ [self cacheDisplayInRect:[self bounds]
toBitmapImageRep:imageRep];
+ [dragImage addRepresentation:imageRep];
}
- if (dragImage == nil)
- dragImage = [self image];
+ imageRect.size = [dragImage size];
imageRect.origin = NSMakePoint(NSMidX([self
bounds]) - 0.5 * NSWidth(imageRect), NSMidY([self bounds]) - 0.5 *
NSHeight(imageRect));
[self dragItems:items withImage:dragImage
fromFrame:imageRect forEvent:theEvent];
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
