mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

draw images using composite to ensure actual width

This commit is contained in:
Mitchell Livingston 2006-10-02 04:20:05 +00:00
parent 7e85221109
commit f0adeba042
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
macosx/Controller.m
View File

@ -655,6 +655,7 @@ static void sleepCallBack(void * controller, io_service_t y, natural_t messageTy
- (void) resumeTorrentsNoWait: (NSArray *) torrents
{
//iterate through instead of all at once to ensure no conflicts
NSEnumerator * enumerator = [torrents objectEnumerator];
Torrent * torrent;
while ((torrent = [enumerator nextObject]))

2
macosx/TorrentTableView.h
View File

@ -25,7 +25,7 @@
#import <Cocoa/Cocoa.h>
#import <transmission.h>
#define BUTTONS_TOTAL_WIDTH 42.0
#define BUTTONS_TOTAL_WIDTH 39.0
@class Controller;

25
macosx/TorrentTableView.m
View File

@ -27,13 +27,13 @@
#import "Controller.h"
#import "Torrent.h"
#define BUTTON_TO_TOP_REGULAR 33.5
#define BUTTON_TO_TOP_REGULAR 33.0
#define BUTTON_TO_TOP_SMALL 20.0
//button layout (from end of bar) is: padding, button, padding, button, padding
//change BUTTONS_TOTAL_WIDTH in .h when changing these values, add 2.0 to that value
#define BUTTON_WIDTH 14.0
#define DISTANCE_FROM_CENTER 2.5
//change BUTTONS_TOTAL_WIDTH when changing this
#define AREA_CENTER 21.0
#define PADDING 3.0
@interface TorrentTableView (Private)
@ -232,6 +232,7 @@
NSRect rect;
Torrent * torrent;
NSImage * image;
NSRect buttonRect = NSMakeRect(0, 0, BUTTON_WIDTH, BUTTON_WIDTH);
[super drawRect: r];
@ -256,17 +257,13 @@
image = nil;
if (image)
{
[image setFlipped: YES];
[image drawAtPoint: rect.origin fromRect: NSMakeRect(0, 0, BUTTON_WIDTH, BUTTON_WIDTH)
operation: NSCompositeSourceOver fraction: 1.0];
}
[image compositeToPoint: NSMakePoint(rect.origin.x, NSMaxY(rect)) fromRect: buttonRect
operation: NSCompositeSourceOver];
rect = [self revealRectForRow: i];
image = NSPointInRect(fClickPoint, rect) ? fRevealOnIcon : fRevealOffIcon;
[image setFlipped: YES];
[image drawAtPoint: rect.origin fromRect: NSMakeRect(0, 0, BUTTON_WIDTH, BUTTON_WIDTH)
operation: NSCompositeSourceOver fraction: 1.0];
[image compositeToPoint: NSMakePoint(rect.origin.x, NSMaxY(rect)) fromRect: buttonRect
operation: NSCompositeSourceOver];
}
}
@ -280,7 +277,7 @@
float buttonToTop = [fDefaults boolForKey: @"SmallView"] ? BUTTON_TO_TOP_SMALL : BUTTON_TO_TOP_REGULAR;
return NSMakeRect(NSMaxX(cellRect) - AREA_CENTER - DISTANCE_FROM_CENTER - BUTTON_WIDTH,
return NSMakeRect(NSMaxX(cellRect) - PADDING - BUTTON_WIDTH - PADDING - BUTTON_WIDTH,
cellRect.origin.y + buttonToTop, BUTTON_WIDTH, BUTTON_WIDTH);
}
@ -290,7 +287,7 @@
float buttonToTop = [fDefaults boolForKey: @"SmallView"] ? BUTTON_TO_TOP_SMALL : BUTTON_TO_TOP_REGULAR;
return NSMakeRect(NSMaxX(cellRect) - AREA_CENTER + DISTANCE_FROM_CENTER,
return NSMakeRect(NSMaxX(cellRect) - PADDING - BUTTON_WIDTH,
cellRect.origin.y + buttonToTop, BUTTON_WIDTH, BUTTON_WIDTH);
}