adium/adium

NSImage's -isFlipped and -setFlipped are no more.
adium-1.6
2014-07-13, Frank Dowsett
3539d1f97887
Parents 463075e8de4d
Children 43d7f3739c3a
NSImage's -isFlipped and -setFlipped are no more.
12 files changed, 14 insertions(+), 43 deletions(-)
  • +3 -9
    Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m
  • +3 -11
    Frameworks/AIUtilities Framework/Source/AIImageTextCell.m
  • +0 -3
    Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m
  • +2 -4
    Frameworks/Adium Framework/Source/AIListContactCell.m
  • +1 -1
    Frameworks/Adium Framework/Source/AIListContactGroupChatCell.m
  • +1 -2
    Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.m
  • +0 -3
    Frameworks/Adium Framework/Source/AIServiceIcons.m
  • +0 -2
    Frameworks/Adium Framework/Source/AIStatusIcons.m
  • +1 -1
    Frameworks/Adium Framework/Source/ESFileTransfer.m
  • +2 -2
    Source/AILogViewerWindowController.m
  • +0 -4
    Source/AIMenuBarIcons.m
  • +1 -1
    Source/AIStandardListWindowController.m
    • --- a/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Frameworks/AIUtilities Framework/Source/AIImageDrawingAdditions.m Sun Jul 13 14:53:29 2014 -0400
    @@ -128,10 +128,6 @@
    newRect = NSMakeRect(0.0f, 0.0f, size.width, size.height);
    newImage = [[NSImage alloc] initWithSize:size];
    - if (flipImage) {
    - [newImage setFlipped:YES];
    - }
    -
    NSImageRep *bestRep;
    if (allowAnimation &&
    @@ -240,10 +236,6 @@
    NSImage *newImage = [[NSImage alloc] initWithSize:size];
    NSImage *scaledImage = [[NSImage alloc] initWithSize:scaleSize];
    - if (flipImage) {
    - [newImage setFlipped:YES];
    - }
    -
    NSImageRep *bestRep;
    if (allowAnimation &&
    @@ -361,7 +353,9 @@
    [self drawInRect:drawRect
    fromRect:NSMakeRect(0, 0, ownSize.width, ownSize.height)
    operation:NSCompositeSourceOver
    - fraction:inFraction];
    + fraction:inFraction
    + respectFlipped:YES
    + hints:nil];
    // Shift the origin if needed, and decrease the available destination rect width, by the passed size
    // (which may exceed the actual image dimensions)
    --- a/Frameworks/AIUtilities Framework/Source/AIImageTextCell.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Frameworks/AIUtilities Framework/Source/AIImageTextCell.m Sun Jul 13 14:53:29 2014 -0400
    @@ -257,12 +257,6 @@
    if (destRect.size.height < cellFrame.size.height) {
    destRect.origin.y += (cellFrame.size.height - destRect.size.height) / 2.0f;
    - }
    -
    - BOOL flippedIt = NO;
    - if (![image isFlipped]) {
    - [image setFlipped:YES];
    - flippedIt = YES;
    }
    [NSGraphicsContext saveGraphicsState];
    @@ -270,13 +264,11 @@
    [image drawInRect:destRect
    fromRect:NSMakeRect(0,0,size.width,size.height)
    operation:NSCompositeSourceOver
    - fraction:1.0f];
    + fraction:1.0f
    + respectFlipped:YES
    + hints:nil];
    [NSGraphicsContext restoreGraphicsState];
    - if (flippedIt) {
    - [image setFlipped:NO];
    - }
    -
    return destRect.size;
    }
    --- a/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Frameworks/AIUtilities Framework/Source/AIVariableHeightOutlineView.m Sun Jul 13 14:53:29 2014 -0400
    @@ -341,8 +341,6 @@
    image = [[[NSImage alloc] initWithSize:NSMakeSize(rowRect.size.width,
    rowRect.size.height*count + [self intercellSpacing].height*(count-1))] autorelease];
    - //Draw (Since the OLV is normally flipped, we have to be flipped when drawing)
    - [image setFlipped:YES];
    [image lockFocus];
    tableColumnsCount = [tableColumns count];
    @@ -379,7 +377,6 @@
    }
    [image unlockFocus];
    - [image setFlipped:NO];
    //Offset the drag image (Remember: The system centers it by default, so this is an offset from center)
    NSPoint clickLocation = [self convertPoint:[dragEvent locationInWindow] fromView:nil];
    --- a/Frameworks/Adium Framework/Source/AIListContactCell.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Frameworks/Adium Framework/Source/AIListContactCell.m Sun Jul 13 14:53:29 2014 -0400
    @@ -474,7 +474,7 @@
    if (!image) {
    // if using service icons, set the interpolation to high
    [[NSGraphicsContext currentContext] setImageInterpolation:NSImageInterpolationHigh];
    - image = [AIServiceIcons serviceIconForObject:listObject type:AIServiceIconLarge direction:AIIconFlipped];
    + image = [AIServiceIcons serviceIconForObject:listObject type:AIServiceIconLarge direction:AIIconNormal];
    }
    //Rounded corners for our user images.
    @@ -528,12 +528,10 @@
    }
    NSImage *image = [self statusImage];
    - [image setFlipped:![image isFlipped]];
    rect = [image drawInRect:rect
    atSize:NSMakeSize(0, 0)
    position:position
    fraction:1.0f];
    - [image setFlipped:![image isFlipped]];
    if (!isBadge) {
    if (position == IMAGE_POSITION_LEFT) rect.origin.x += STATUS_ICON_RIGHT_PAD;
    @@ -708,7 +706,7 @@
    - (NSImage *)serviceImage
    {
    AIListObject *listObject = [proxyObject listObject];
    - return [AIServiceIcons serviceIconForObject:listObject type:AIServiceIconList direction:AIIconFlipped];
    + return [AIServiceIcons serviceIconForObject:listObject type:AIServiceIconList direction:AIIconNormal];
    }
    - (float)imageOpacityForDrawing
    --- a/Frameworks/Adium Framework/Source/AIListContactGroupChatCell.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Frameworks/Adium Framework/Source/AIListContactGroupChatCell.m Sun Jul 13 14:53:29 2014 -0400
    @@ -53,7 +53,7 @@
    AIListContact *listObject = [chat contactForNick:proxyObject.nick];
    return [AIStatusIcons statusIconForListObject:(AIListObject *)listObject
    type:AIStatusIconTab
    - direction:AIIconFlipped];
    + direction:AIIconNormal];
    }
    - (NSColor *)textColor
    --- a/Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Frameworks/Adium Framework/Source/AIListOutlineView+Drawing.m Sun Jul 13 14:53:29 2014 -0400
    @@ -138,8 +138,7 @@
    {
    if (backgroundImage != inImage) {
    [backgroundImage release];
    - backgroundImage = [inImage retain];
    - [backgroundImage setFlipped:YES];
    + backgroundImage = [inImage retain];
    }
    [(NSClipView *)[self superview] setCopiesOnScroll:(!backgroundImage)];
    --- a/Frameworks/Adium Framework/Source/AIServiceIcons.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Frameworks/Adium Framework/Source/AIServiceIcons.m Sun Jul 13 14:53:29 2014 -0400
    @@ -60,7 +60,6 @@
    serviceIcon = [service defaultServiceIconOfType:iconType];
    if (serviceIcon) {
    - if (iconDirection == AIIconFlipped) [serviceIcon setFlipped:YES];
    [serviceIcons[iconType][iconDirection] setObject:serviceIcon forKey:service.serviceID];
    }
    }
    @@ -105,7 +104,6 @@
    }
    if (serviceIcon) {
    - if (iconDirection == AIIconFlipped) [serviceIcon setFlipped:YES];
    [serviceIcons[iconType][iconDirection] setObject:serviceIcon forKey:serviceID];
    [serviceIcon release];
    } else {
    @@ -113,7 +111,6 @@
    serviceIcon = [self defaultServiceIconForType:iconType serviceID:serviceID];
    if (serviceIcon) {
    //Cache the default service icon (until the pack is changed) so we have it immediately next time
    - if (iconDirection == AIIconFlipped) [serviceIcon setFlipped:YES];
    [serviceIcons[iconType][iconDirection] setObject:serviceIcon forKey:serviceID];
    }
    }
    --- a/Frameworks/Adium Framework/Source/AIStatusIcons.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Frameworks/Adium Framework/Source/AIStatusIcons.m Sun Jul 13 14:53:29 2014 -0400
    @@ -133,7 +133,6 @@
    if (statusIcon) {
    - if (iconDirection == AIIconFlipped) [statusIcon setFlipped:YES];
    [statusIcons[iconType][iconDirection] setObject:statusIcon forKey:statusName];
    }
    @@ -146,7 +145,6 @@
    statusIcon = [NSImage imageNamed:@"DefaultBlockedStatusIcon" forClass:[self class] loadLazily:YES];
    if (statusIcon) {
    - if (iconDirection == AIIconFlipped) [statusIcon setFlipped:YES];
    [statusIcons[iconType][iconDirection] setObject:statusIcon forKey:statusName];
    }
    }
    --- a/Frameworks/Adium Framework/Source/ESFileTransfer.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Frameworks/Adium Framework/Source/ESFileTransfer.m Sun Jul 13 14:53:29 2014 -0400
    @@ -373,7 +373,7 @@
    NSRect rect = { NSZeroPoint, [iconImage size] };
    NSRect bottomRight = NSMakeRect(NSMidX(rect),
    - ([iconImage isFlipped] ? NSMidY(rect) : NSMinY(rect)),
    + NSMidY(rect),
    (NSWidth(rect)/2.0f),
    (NSHeight(rect)/2.0f));
    --- a/Source/AILogViewerWindowController.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Source/AILogViewerWindowController.m Sun Jul 13 14:53:29 2014 -0400
    @@ -2150,13 +2150,13 @@
    size:NSMakeSize(16,16)];
    if (!image) image = [[AIServiceIcons serviceIconForObject:(AIListContact *)item
    type:AIServiceIconSmall
    - direction:AIIconFlipped] imageByScalingForMenuItem];
    + direction:AIIconNormal] imageByScalingForMenuItem];
    [cell setImage:image];
    } else if ([item isKindOfClass:[AILogToGroup class]]) {
    [cell setImage:[[AIServiceIcons serviceIconForService:[adium.accountController firstServiceWithServiceID:[(AILogToGroup *)item serviceClass]]
    type:AIServiceIconSmall
    - direction:AIIconFlipped] imageByScalingForMenuItem]];
    + direction:AIIconNormal] imageByScalingForMenuItem]];
    } else if ([item isKindOfClass:[allContactsIdentifier class]]) {
    if ([[outlineView arrayOfSelectedItems] containsObjectIdenticalTo:item] &&
    --- a/Source/AIMenuBarIcons.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Source/AIMenuBarIcons.m Sun Jul 13 14:53:29 2014 -0400
    @@ -62,8 +62,6 @@
    }
    }
    - [image setFlipped:YES];
    -
    return image;
    }
    @@ -161,8 +159,6 @@
    NSImage *altImage = [[NSImage alloc] initWithSize:[inImage size]];
    NSBitmapImageRep *srcImageRep = [inImage largestBitmapImageRep];
    - [altImage setFlipped:[inImage isFlipped]];
    -
    id monochromeFilter, invertFilter, alphaFilter;
    monochromeFilter = [CIFilter filterWithName:@"CIColorMonochrome"];
    --- a/Source/AIStandardListWindowController.m Sun Jul 13 14:16:27 2014 -0400
    +++ b/Source/AIStandardListWindowController.m Sun Jul 13 14:53:29 2014 -0400
    @@ -457,7 +457,7 @@
    [statusMenuView setTitle:(title ? title : @"")];
    /*
    [statusMenuView setImage:[activeStatus iconOfType:AIStatusIconList
    - direction:AIIconFlipped]];
    + direction:AIIconNormal]];
    */
    [imageView_status setImage:[activeStatus iconOfType:AIStatusIconList
    direction:AIIconNormal]];