Revision: 10931
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=10931&view=rev
Author: hofman
Date: 2007-08-17 04:47:00 -0700 (Fri, 17 Aug 2007)
Log Message:
-----------
Only make dragimage transparent if it isn't supplied by the delegate.
Modified Paths:
--------------
trunk/bibdesk/BDSKDragImageView.m
Modified: trunk/bibdesk/BDSKDragImageView.m
===================================================================
--- trunk/bibdesk/BDSKDragImageView.m 2007-08-17 04:29:03 UTC (rev 10930)
+++ trunk/bibdesk/BDSKDragImageView.m 2007-08-17 11:47:00 UTC (rev 10931)
@@ -107,22 +107,21 @@
if ([delegate
respondsToSelector:@selector(dragImageView:writeDataToPasteboard:)] &&
[delegate dragImageView:self
writeDataToPasteboard:pboard]) {
- NSImage *image;
- NSImage *dragImage;
- NSSize imageSize;
- if ([delegate
respondsToSelector:@selector(dragImageForDragImageView:)])
- image = [delegate
dragImageForDragImageView:self];
- else
- image = [self image];
- imageSize = [image size];
-
- dragImage = [[NSImage alloc]
initWithSize:imageSize];
- [dragImage lockFocus];
- [image
compositeToPoint:NSZeroPoint operation:NSCompositeCopy fraction:0.7];
- [dragImage unlockFocus];
-
- [self dragImage:dragImage
at:NSMakePoint(mouseLoc.x - 0.5f * imageSize.width, mouseLoc.y - 0.5f *
imageSize.height) offset:NSZeroSize event:theEvent pasteboard:pboard
source:self slideBack:YES];
- [dragImage release];
+ NSImage *dragImage = nil;
+ NSSize imageSize = NSZeroSize;
+ if ([delegate
respondsToSelector:@selector(dragImageForDragImageView:)]) {
+ dragImage = [delegate
dragImageForDragImageView:self];
+ imageSize = [dragImage size];
+ }
+ if (dragImage == nil) {
+ NSImage *image = [self
image];
+ imageSize = [image size];
+ dragImage = [[[NSImage alloc]
initWithSize:imageSize] autorelease];
+ [dragImage lockFocus];
+ [image compositeToPoint:NSZeroPoint
operation:NSCompositeCopy fraction:0.7];
+ [dragImage unlockFocus];
+ }
+ [self dragImage:dragImage at:NSMakePoint(mouseLoc.x -
0.5f * imageSize.width, mouseLoc.y - 0.5f * imageSize.height) offset:NSZeroSize
event:theEvent pasteboard:pboard source:self slideBack:YES];
}
keepOn = NO;
break;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
