get rid of copying the priority images and elliminate another setFlipped: on 10.6

This commit is contained in:
Mitchell Livingston
2009-10-18 14:02:22 +00:00
parent 045b7d92fb
commit f3c7dde651
2 changed files with 4 additions and 10 deletions

View File

@@ -31,8 +31,6 @@
BOOL fTracking, fMouseDownControlButton, fMouseDownRevealButton, fMouseDownActionButton,
fHoverControl, fHoverReveal, fHoverAction;
NSImage * fHighPriorityImage, * fLowPriorityImage;
NSColor * fBarBorderColor, * fBluePieceColor;
}

View File

@@ -107,12 +107,6 @@
fBluePieceColor = [[NSColor colorWithCalibratedRed: 0.0f green: 0.4f blue: 0.8f alpha: 1.0f] retain];
fBarBorderColor = [[NSColor colorWithCalibratedWhite: 0.0f alpha: 0.2f] retain];
fHighPriorityImage = [[NSImage imageNamed: @"PriorityHigh.png"] copy];
[fHighPriorityImage setFlipped: YES];
fLowPriorityImage = [[NSImage imageNamed: @"PriorityLow.png"] copy];
[fLowPriorityImage setFlipped: YES];
}
return self;
}
@@ -478,12 +472,14 @@
//priority icon
if ([torrent priority] != TR_PRI_NORMAL)
{
NSImage * priorityImage = [torrent priority] == TR_PRI_HIGH ? fHighPriorityImage : fLowPriorityImage;
NSImage * priorityImage = [torrent priority] == TR_PRI_HIGH ? [NSImage imageNamed: @"PriorityHigh.png"]
: [NSImage imageNamed: @"PriorityLow.png"];
NSRect priorityRect = NSMakeRect(NSMaxX(titleRect) + PADDING_BETWEEN_TITLE_AND_PRIORITY,
titleRect.origin.y - (PRIORITY_ICON_HEIGHT - titleRect.size.height) / 2.0,
PRIORITY_ICON_WIDTH, PRIORITY_ICON_HEIGHT);
[priorityImage drawInRect: priorityRect fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
[self drawImage: priorityImage inRect: priorityRect];
}
//progress