adium/adium

7a7aed005b2b
-dissolveToPoint is deprecated, change to -drawAtPoint fixes #16362.
(grafted from ff13562cc57345c6d13bb51fa1f9357152852102)
--- a/Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m Fri Nov 22 18:24:16 2013 +0100
+++ b/Frameworks/AIUtilities Framework/Source/AIImageViewWithImagePicker.m Thu Apr 25 14:09:50 2013 -0400
@@ -263,7 +263,7 @@
//Draw our original image as 50% transparent
[dragImage lockFocus];
- [[self image] dissolveToPoint:NSZeroPoint fraction:0.5f];
+ [[self image] drawAtPoint:NSZeroPoint fromRect:NSMakeRect(0, 0, self.image.size.width, self.image.size.height) operation:NSCompositeCopy fraction:0.5f];
[dragImage unlockFocus];
//We want the image to resize
--- a/Source/AIContactInfoImageViewWithImagePicker.m Fri Nov 22 18:24:16 2013 +0100
+++ b/Source/AIContactInfoImageViewWithImagePicker.m Thu Apr 25 14:09:50 2013 -0400
@@ -91,26 +91,8 @@
}
[[NSBezierPath bezierPathWithOvalInRect:snapBackRect] fill];
- [snapbackImage dissolveToPoint:snapBackRect.origin fraction:1.0f];
+ [snapbackImage drawAtPoint:snapBackRect.origin fromRect:[self bounds] operation:NSCompositeSourceOver fraction:1.0f];
}
-
- /*
- if (hovered) {
- [[[NSColor blackColor] colorWithAlphaComponent:0.40] set];
- [clipPath fill];
-
- //Draw the arrow
- NSBezierPath *arrowPath = [NSBezierPath bezierPath];
- NSRect frame = [self frame];
- [arrowPath moveToPoint:NSMakePoint(frame.size.width - ARROW_XOFFSET - ARROW_WIDTH,
- (ARROW_YOFFSET + ARROW_HEIGHT))];
- [arrowPath relativeLineToPoint:NSMakePoint(ARROW_WIDTH, 0)];
- [arrowPath relativeLineToPoint:NSMakePoint(-(ARROW_WIDTH/2), -(ARROW_HEIGHT))];
-
- [[NSColor whiteColor] set];
- [arrowPath fill];
- }
- */
[NSGraphicsContext restoreGraphicsState];
}