Changeset 7568

Timestamp:

Jan 2, 2009, 1:10:54 AM (12 years ago)

Author:

livings124

Message:

clean up the table text coloring code; trivial cleanup

Location:

trunk/macosx

Files:

• BadgeView.h (modified) (1 diff)
• BadgeView.m (modified) (1 diff)
• Badger.m (modified) (1 diff)
• FileNameCell.m (modified) (1 diff)
• GroupsController.m (modified) (1 diff)
• TorrentCell.m (modified) (1 diff)

trunk/macosx/BadgeView.h

@@ -38 +38 @@
 - (id) initWithFrame: (NSRect) frame lib: (tr_session *) lib;
 
-- (BOOL) setRatesWithDownload: (CGFloat) downloadRate upload: (CGFloat) uploadRate;
+- (void) displayRatesWithDownload: (CGFloat) downloadRate upload: (CGFloat) uploadRate;
 - (void) setQuitting;
 

trunk/macosx/BadgeView.m

@@ -55 +55 @@
 }
 
-- (BOOL) setRatesWithDownload: (CGFloat) downloadRate upload: (CGFloat) uploadRate
+- (void) displayRatesWithDownload: (CGFloat) downloadRate upload: (CGFloat) uploadRate
 {
     //only needs update if the badges were displayed or are displayed now
     if (fDownloadRate == downloadRate && fUploadRate == uploadRate)
-        return NO;
+        return;
     
     fDownloadRate = downloadRate;
     fUploadRate = uploadRate;
-    return YES;
+    [self display];
 }
 

trunk/macosx/Badger.m

@@ -57 +57 @@
 {
     float downloadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeDownloadRate"]
-                            ? tr_sessionGetPieceSpeed(fLib, TR_DOWN) : 0.0f;
+                            ? tr_sessionGetPieceSpeed(fLib, TR_DOWN) : 0.0;
     float uploadRate = [[NSUserDefaults standardUserDefaults] boolForKey: @"BadgeUploadRate"]
-                        ? tr_sessionGetPieceSpeed(fLib, TR_UP) : 0.0f;
+                        ? tr_sessionGetPieceSpeed(fLib, TR_UP) : 0.0;
     
-    //only update if the badged values change
-    if ([(BadgeView *)[[NSApp dockTile] contentView] setRatesWithDownload: downloadRate upload: uploadRate])
-        [[NSApp dockTile] display];
+    [(BadgeView *)[[NSApp dockTile] contentView] displayRatesWithDownload: downloadRate upload: uploadRate];
 }
 

trunk/macosx/FileNameCell.m

@@ -140 +140 @@
     [[self image] drawInRect: [self imageRectForBounds: cellFrame] fromRect: NSZeroRect operation: NSCompositeSourceOver fraction: 1.0];
     
+    NSColor * titleColor, * statusColor;
+    if ([self backgroundStyle] == NSBackgroundStyleDark)
+        titleColor = statusColor = [NSColor whiteColor];
+    else if ([[(FileOutlineView *)[self controlView] torrent] checkForFiles: [(FileListNode *)[self objectValue] indexes]] == NSOffState)
+        titleColor = statusColor = [NSColor disabledControlTextColor];
+    else
+    {
+        titleColor = [NSColor controlTextColor];
+        statusColor = [NSColor darkGrayColor];
+    }
+    
     //title
-    NSColor * specialColor = nil;
-    if ([self isHighlighted]
-            && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
-        specialColor = [NSColor whiteColor];
-    else if ([[(FileOutlineView *)[self controlView] torrent] checkForFiles: [(FileListNode *)[self objectValue] indexes]] == NSOffState)
-        specialColor = [NSColor disabledControlTextColor];
-    else;
-    
-    NSAttributedString * titleString = [self attributedTitleWithColor: specialColor ? specialColor : [NSColor controlTextColor]];
+    NSAttributedString * titleString = [self attributedTitleWithColor: titleColor];
     NSRect titleRect = [self rectForTitleWithString: titleString inBounds: cellFrame];
     [titleString drawInRect: titleRect];
     
     //status
-    NSAttributedString * statusString = [self attributedStatusWithColor: specialColor ? specialColor : [NSColor darkGrayColor]];
+    NSAttributedString * statusString = [self attributedStatusWithColor: statusColor];
     NSRect statusRect = [self rectForStatusWithString: statusString withTitleRect: titleRect inBounds: cellFrame];
     [statusString drawInRect: statusRect];

trunk/macosx/GroupsController.m

@@ -367 +367 @@
             return row;
     }
-    return -1; // Default to no group
+    return -1;
 }
 

trunk/macosx/TorrentCell.m

@@ -433 +433 @@
     //text color
     NSColor * titleColor, * statusColor;
-    if ([self isHighlighted]
-        && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
+    if ([self backgroundStyle] == NSBackgroundStyleDark)
     {
         titleColor = [NSColor whiteColor];