Changeset 9217

Timestamp:

Sep 28, 2009, 5:42:24 PM (13 years ago)

Author:

livings124

Message:

set the color for table cells only when actually drawing (and only once each time the draw method is alled)

Location:

trunk/macosx

Files:

• FileNameCell.m (modified) (4 diffs)
• TorrentCell.m (modified) (10 diffs)
• TrackerCell.m (modified) (9 diffs)

trunk/macosx/FileNameCell.m

@@ -42 +42 @@
 - (NSRect) rectForStatusWithString: (NSAttributedString *) string withTitleRect: (NSRect) titleRect inBounds: (NSRect) bounds;
 
-- (NSAttributedString *) attributedTitleWithColor: (NSColor *) color;
-- (NSAttributedString *) attributedStatusWithColor: (NSColor *) color;
+- (NSAttributedString *) attributedTitle;
+- (NSAttributedString *) attributedStatus;
 
 @end
@@ -125 +125 @@
 - (NSRect) titleRectForBounds: (NSRect) bounds
 {
-    return [self rectForTitleWithString: [self attributedTitleWithColor: nil] inBounds: bounds];
+    return [self rectForTitleWithString: [self attributedTitle] inBounds: bounds];
 }
 
 - (NSRect) statusRectForBounds: (NSRect) bounds
 {
-    return [self rectForStatusWithString: [self attributedStatusWithColor: nil]
+    return [self rectForStatusWithString: [self attributedStatus]
             withTitleRect: [(FileListNode *)[self objectValue] isFolder] ? [self titleRectForBounds: bounds] : NSZeroRect
             inBounds: bounds];
@@ -151 +151 @@
     }
     
+    [fTitleAttributes setObject: titleColor forKey: NSForegroundColorAttributeName];
+    [fStatusAttributes setObject: statusColor forKey: NSForegroundColorAttributeName];
+    
     //title
-    NSAttributedString * titleString = [self attributedTitleWithColor: titleColor];
+    NSAttributedString * titleString = [self attributedTitle];
     NSRect titleRect = [self rectForTitleWithString: titleString inBounds: cellFrame];
     [titleString drawInRect: titleRect];
     
     //status
-    NSAttributedString * statusString = [self attributedStatusWithColor: statusColor];
+    NSAttributedString * statusString = [self attributedStatus];
     NSRect statusRect = [self rectForStatusWithString: statusString withTitleRect: titleRect inBounds: cellFrame];
     [statusString drawInRect: statusRect];
@@ -210 +213 @@
 }
 
-- (NSAttributedString *) attributedTitleWithColor: (NSColor *) color
-{
-    if (color)
-        [fTitleAttributes setObject: color forKey: NSForegroundColorAttributeName];
-        
+- (NSAttributedString *) attributedTitle
+{
     NSString * title = [(FileListNode *)[self objectValue] name];
     return [[[NSAttributedString alloc] initWithString: title attributes: fTitleAttributes] autorelease];
 }
 
-- (NSAttributedString *) attributedStatusWithColor: (NSColor *) color
-{
-    if (color)
-        [fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
-    
+- (NSAttributedString *) attributedStatus
+{
     Torrent * torrent = [(FileOutlineView *)[self controlView] torrent];
     FileListNode * node = (FileListNode *)[self objectValue];

trunk/macosx/TorrentCell.m

@@ -74 +74 @@
 - (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds;
 
-- (NSAttributedString *) attributedTitleWithColor: (NSColor *) color;
-- (NSAttributedString *) attributedStatusString: (NSString *) string withColor: (NSColor *) color;
+- (NSAttributedString *) attributedTitle;
+- (NSAttributedString *) attributedStatusString: (NSString *) string;
 
 - (NSString *) buttonString;
@@ -131 +131 @@
 - (NSRect) titleRectForBounds: (NSRect) bounds
 {
-    return [self rectForTitleWithString: [self attributedTitleWithColor: nil]
+    return [self rectForTitleWithString: [self attributedTitle]
             basedOnMinimalStatusRect: [self minimalStatusRectForBounds: bounds] inBounds: bounds];
 }
@@ -140 +140 @@
         return NSZeroRect;
     
-    return [self rectForMinimalStatusWithString: [self attributedStatusString: [self minimalStatusString] withColor: nil]
+    return [self rectForMinimalStatusWithString: [self attributedStatusString: [self minimalStatusString]]
             inBounds: bounds];
 }
@@ -149 +149 @@
         return NSZeroRect;
     
-    return [self rectForProgressWithString: [self attributedStatusString: [[self representedObject] progressString] withColor: nil]
+    return [self rectForProgressWithString: [self attributedStatusString: [[self representedObject] progressString]]
             inBounds: bounds];
 }
@@ -177 +177 @@
         return NSZeroRect;
     
-    return [self rectForStatusWithString: [self attributedStatusString: [self statusString] withColor: nil] inBounds: bounds];
+    return [self rectForStatusWithString: [self attributedStatusString: [self statusString]] inBounds: bounds];
 }
 
@@ -457 +457 @@
     }
     
+    [fTitleAttributes setObject: titleColor forKey: NSForegroundColorAttributeName];
+    [fStatusAttributes setObject: statusColor forKey: NSForegroundColorAttributeName];
+    
     //minimal status
     NSRect minimalStatusRect;
     if (minimal)
     {
-        NSAttributedString * minimalString = [self attributedStatusString: [self minimalStatusString] withColor: statusColor];
+        NSAttributedString * minimalString = [self attributedStatusString: [self minimalStatusString]];
         minimalStatusRect = [self rectForMinimalStatusWithString: minimalString inBounds: cellFrame];
         
@@ -468 +471 @@
     
     //title
-    NSAttributedString * titleString = [self attributedTitleWithColor: titleColor];
+    NSAttributedString * titleString = [self attributedTitle];
     NSRect titleRect = [self rectForTitleWithString: titleString basedOnMinimalStatusRect: minimalStatusRect inBounds: cellFrame];
     [titleString drawInRect: titleRect];
@@ -486 +489 @@
     if (!minimal)
     {
-        NSAttributedString * progressString = [self attributedStatusString: [torrent progressString] withColor: statusColor];
+        NSAttributedString * progressString = [self attributedStatusString: [torrent progressString]];
         NSRect progressRect = [self rectForProgressWithString: progressString inBounds: cellFrame];
         
@@ -549 +552 @@
     if (!minimal)
     {
-        NSAttributedString * statusString = [self attributedStatusString: [self statusString] withColor: statusColor];
+        NSAttributedString * statusString = [self attributedStatusString: [self statusString]];
         [statusString drawInRect: [self rectForStatusWithString: statusString inBounds: cellFrame]];
     }
@@ -745 +748 @@
 }
 
-- (NSAttributedString *) attributedTitleWithColor: (NSColor *) color
-{
-    if (color)
-        [fTitleAttributes setObject: color forKey: NSForegroundColorAttributeName];
-    
+- (NSAttributedString *) attributedTitle
+{
     NSString * title = [[self representedObject] name];
     return [[[NSAttributedString alloc] initWithString: title attributes: fTitleAttributes] autorelease];
 }
 
-- (NSAttributedString *) attributedStatusString: (NSString *) string withColor: (NSColor *) color
-{
-    if (color)
-        [fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
-    
+- (NSAttributedString *) attributedStatusString: (NSString *) string
+{
     return [[[NSAttributedString alloc] initWithString: string attributes: fStatusAttributes] autorelease];
 }

trunk/macosx/TrackerCell.m

@@ -34 +34 @@
 #define PADDING_ABOVE_NAME 2.0
 #define PADDING_BETWEEN_LINES 1.0
-#define PADDING_BETWEEN_LINES_ON_SAME_LINE 3.0
+#define PADDING_BETWEEN_LINES_ON_SAME_LINE 4.0
 #define COUNT_WIDTH 40.0
 
@@ -49 +49 @@
             inBounds: (NSRect) bounds;
 
-- (NSAttributedString *) attributedNameWithColor: (NSColor *) color;
-- (NSAttributedString *) attributedStatusWithString: (NSString *) statusString color: (NSColor *) color;
-- (NSAttributedString *) attributedCount: (NSInteger) count color: (NSColor *) color;
+- (NSAttributedString *) attributedName;
+- (NSAttributedString *) attributedStatusWithString: (NSString *) statusString;
+- (NSAttributedString *) attributedCount: (NSInteger) count;
 
 @end
@@ -119 +119 @@
     }
 
-    
+    //set table colors
     NSColor * nameColor, * statusColor;
     if ([self backgroundStyle] == NSBackgroundStyleDark)
@@ -129 +129 @@
     }
     
+    [fNameAttributes setObject: nameColor forKey: NSForegroundColorAttributeName];
+    [fStatusAttributes setObject: statusColor forKey: NSForegroundColorAttributeName];
+    
     TrackerNode * node = (TrackerNode *)[self objectValue];
     
     //name
-    NSAttributedString * nameString = [self attributedNameWithColor: nameColor];
+    NSAttributedString * nameString = [self attributedName];
     const NSRect nameRect = [self rectForNameWithString: nameString inBounds: cellFrame];
     [nameString drawInRect: nameRect];
     
     //count strings
-    NSAttributedString * seederString = [self attributedCount: [node totalSeeders] color: statusColor];
+    NSAttributedString * seederString = [self attributedCount: [node totalSeeders]];
     const NSRect seederRect = [self rectForCountWithString: seederString withAboveRect: nameRect inBounds: cellFrame];
     [seederString drawInRect: seederRect];
     
-    NSAttributedString * leecherString = [self attributedCount: [node totalLeechers] color: statusColor];
+    NSAttributedString * leecherString = [self attributedCount: [node totalLeechers]];
     const NSRect leecherRect = [self rectForCountWithString: leecherString withAboveRect: seederRect inBounds: cellFrame];
     [leecherString drawInRect: leecherRect];
     
-    NSAttributedString * downloadedString = [self attributedCount: [node totalDownloaded] color: statusColor];
+    NSAttributedString * downloadedString = [self attributedCount: [node totalDownloaded]];
     const NSRect downloadedRect = [self rectForCountWithString: downloadedString withAboveRect: leecherRect inBounds: cellFrame];
     [downloadedString drawInRect: downloadedRect];
@@ -151 +154 @@
     //count label strings
     NSString * seederLabelBaseString = [NSLocalizedString(@"Seeders", "tracker peer stat") stringByAppendingFormat: @": "];
-    NSAttributedString * seederLabelString = [self attributedStatusWithString: seederLabelBaseString color: statusColor];
+    NSAttributedString * seederLabelString = [self attributedStatusWithString: seederLabelBaseString];
     const NSRect seederLabelRect = [self rectForCountLabelWithString: seederLabelString withRightRect: seederRect
                                         inBounds: cellFrame];
@@ -157 +160 @@
     
     NSString * leecherLabelBaseString = [NSLocalizedString(@"Leechers", "tracker peer stat") stringByAppendingFormat: @": "];
-    NSAttributedString * leecherLabelString = [self attributedStatusWithString: leecherLabelBaseString color: statusColor];
+    NSAttributedString * leecherLabelString = [self attributedStatusWithString: leecherLabelBaseString];
     const NSRect leecherLabelRect = [self rectForCountLabelWithString: leecherLabelString withRightRect: leecherRect
                                         inBounds: cellFrame];
@@ -163 +166 @@
     
     NSString * downloadedLabelBaseString = [NSLocalizedString(@"Downloaded", "tracker peer stat") stringByAppendingFormat: @": "];
-    NSAttributedString * downloadedLabelString = [self attributedStatusWithString: downloadedLabelBaseString color: statusColor];
+    NSAttributedString * downloadedLabelString = [self attributedStatusWithString: downloadedLabelBaseString];
     const NSRect downloadedLabelRect = [self rectForCountLabelWithString: downloadedLabelString withRightRect: downloadedRect
                                         inBounds: cellFrame];
@@ -169 +172 @@
     
     //status strings
-    NSAttributedString * lastAnnounceString = [self attributedStatusWithString: [node lastAnnounceStatusString] color: statusColor];
+    NSAttributedString * lastAnnounceString = [self attributedStatusWithString: [node lastAnnounceStatusString]];
     const NSRect lastAnnounceRect = [self rectForStatusWithString: lastAnnounceString withAboveRect: nameRect
                                         withRightRect: seederLabelRect inBounds: cellFrame];
     [lastAnnounceString drawInRect: lastAnnounceRect];
     
-    NSAttributedString * nextAnnounceString = [self attributedStatusWithString: [node nextAnnounceStatusString] color: statusColor];
+    NSAttributedString * nextAnnounceString = [self attributedStatusWithString: [node nextAnnounceStatusString]];
     const NSRect nextAnnounceRect = [self rectForStatusWithString: nextAnnounceString withAboveRect: lastAnnounceRect
                                         withRightRect: leecherLabelRect inBounds: cellFrame];
     [nextAnnounceString drawInRect: nextAnnounceRect];
     
-    NSAttributedString * lastScrapeString = [self attributedStatusWithString: [node lastScrapeStatusString] color: statusColor];
+    NSAttributedString * lastScrapeString = [self attributedStatusWithString: [node lastScrapeStatusString]];
     const NSRect lastScrapeRect = [self rectForStatusWithString: lastScrapeString withAboveRect: nextAnnounceRect
                                     withRightRect: downloadedLabelRect inBounds: cellFrame];
@@ -291 +294 @@
 }
 
-- (NSAttributedString *) attributedNameWithColor: (NSColor *) color
-{
-    [fNameAttributes setObject: color forKey: NSForegroundColorAttributeName];
-    
+- (NSAttributedString *) attributedName
+{
     NSString * name = [(TrackerNode *)[self objectValue] host];
     return [[[NSAttributedString alloc] initWithString: name attributes: fNameAttributes] autorelease];
 }
 
-- (NSAttributedString *) attributedStatusWithString: (NSString *) statusString color: (NSColor *) color
-{
-    [fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
-    
+- (NSAttributedString *) attributedStatusWithString: (NSString *) statusString
+{
     return [[[NSAttributedString alloc] initWithString: statusString attributes: fStatusAttributes] autorelease];
 }
 
-- (NSAttributedString *) attributedCount: (NSInteger) count color: (NSColor *) color
-{
-    [fStatusAttributes setObject: color forKey: NSForegroundColorAttributeName];
-    
+- (NSAttributedString *) attributedCount: (NSInteger) count
+{
     NSString * countString = count != -1 ? [NSString stringWithFormat: @"%d", count] : NSLocalizedString(@"N/A", "tracker peer stat");
     return [[[NSAttributedString alloc] initWithString: countString attributes: fStatusAttributes] autorelease];