Changeset 4132

Timestamp:

Dec 12, 2007, 5:01:31 AM (15 years ago)

Author:

livings124

Message:

use a simpler method for determining text color of table cells on leopard

Location:

trunk/macosx

Files:

• Controller.m (modified) (2 diffs)
• FileNameCell.m (modified) (2 diffs)
• TorrentCell.m (modified) (2 diffs)

trunk/macosx/Controller.m

@@ -251 +251 @@
         [fWindow setContentBorderThickness: [[fTableView enclosingScrollView] frame].origin.y forEdge: NSMinYEdge];
     
-    if (![NSApp isOnLeopardOrBetter])
-    {
-        //set info and filter keyboard shortcuts
-        /*[fNextInfoTabItem setKeyEquivalent: [NSString stringWithCharacters: & NSRightArrowFunctionKey length: 1]];
-        [fPrevInfoTabItem setKeyEquivalent: [NSString stringWithCharacters: & NSLeftArrowFunctionKey length: 1]];
-        
-        [fNextFilterItem setKeyEquivalent: [NSString stringWithCharacters: & NSRightArrowFunctionKey length: 1]];
-        [fNextFilterItem setKeyEquivalentModifierMask: NSCommandKeyMask | NSAlternateKeyMask];
-        [fPrevFilterItem setKeyEquivalent: [NSString stringWithCharacters: & NSLeftArrowFunctionKey length: 1]];
-        [fPrevFilterItem setKeyEquivalentModifierMask: NSCommandKeyMask | NSAlternateKeyMask];*/
-    }
-    
     if ([NSApp isOnLeopardOrBetter])
         [[fTotalTorrentsField cell] setBackgroundStyle: NSBackgroundStyleRaised];
     
-    //set up filter bar
+    
     if (![NSApp isOnLeopardOrBetter])
     {
@@ -287 +275 @@
     }
     
+    //set up filter bar
     NSView * contentView = [fWindow contentView];
     NSSize windowSize = [contentView convertSize: [fWindow frame].size fromView: nil];

trunk/macosx/FileNameCell.m

@@ -26 +26 @@
 #import "FileOutlineView.h"
 #import "Torrent.h"
+#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 
@@ -92 +93 @@
     //title
     NSColor * specialColor = nil;
-    if ([self isHighlighted]
+    if ([NSApp isOnLeopardOrBetter] ? [self backgroundStyle] == NSBackgroundStyleDark : [self isHighlighted]
             && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
         specialColor = [NSColor whiteColor];

trunk/macosx/TorrentCell.m

@@ -25 +25 @@
 #import "TorrentCell.h"
 #import "TorrentTableView.h"
+#import "NSApplicationAdditions.h"
 #import "NSStringAdditions.h"
 #import "CTGradientAdditions.h"
@@ -224 +225 @@
     //text color
     NSColor * titleColor, * statusColor;
-    if ([self isHighlighted]
+    if ([NSApp isOnLeopardOrBetter] ? [self backgroundStyle] == NSBackgroundStyleDark : [self isHighlighted]
         && [[self highlightColorWithFrame: cellFrame inView: controlView] isEqual: [NSColor alternateSelectedControlColor]])
     {