From 5c8a9b1a15ffd1ecf96340d3f43a4ca916665b9b Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Mon, 10 Feb 2014 01:38:10 +0000 Subject: Fix run-time warnings due to use of deprecated [NSImage compositeToPoint:...] operations --- Source/ImageAndTextCell.m | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) (limited to 'Source') diff --git a/Source/ImageAndTextCell.m b/Source/ImageAndTextCell.m index d90e28b9..b556316d 100644 --- a/Source/ImageAndTextCell.m +++ b/Source/ImageAndTextCell.m @@ -143,14 +143,9 @@ imageFrame.size = imageSize; - if ([view isFlipped]) - imageFrame.origin.y += ceilf((cellFrame.size.height + imageFrame.size.height) / 2); - else - imageFrame.origin.y += ceilf((cellFrame.size.height - imageFrame.size.height) / 2); + imageFrame.origin.y += ceilf((cellFrame.size.height - imageFrame.size.height) / 2) - 1; - imageFrame.origin.y -= 1; - - [image compositeToPoint:imageFrame.origin operation:NSCompositeSourceOver]; + [image drawInRect:imageFrame fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0f respectFlipped:YES hints:nil]; } else if (_indentationLevel == 0) cellFrame.size.height = [view frame].size.height+2; @@ -182,12 +177,9 @@ imageFrame.origin.x += 3; imageFrame.size = imageSize; - if ([controlView isFlipped]) - imageFrame.origin.y += ceilf((cellFrame.size.height + imageFrame.size.height) / 2); - else - imageFrame.origin.y += ceilf((cellFrame.size.height - imageFrame.size.height) / 2); + imageFrame.origin.y += ceilf((cellFrame.size.height - imageFrame.size.height) / 2); - [image compositeToPoint:imageFrame.origin operation:NSCompositeSourceOver]; + [image drawInRect:imageFrame fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0f respectFlipped:YES hints:nil]; } [super drawWithFrame:cellFrame inView:controlView]; -- cgit v1.2.3