Changeset 2718

Timestamp:

Aug 11, 2007, 2:33:10 AM (15 years ago)

Author:

livings124

Message:

get the minimal status to toggle based on the new cell method, and fix silly test code that made the error icon always show

Location:

trunk/macosx

Files:

• Torrent.m (modified) (1 diff)
• TorrentCell.h (modified) (1 diff)
• TorrentTableView.m (modified) (1 diff)

trunk/macosx/Torrent.m

@@ -1005 +1005 @@
 
 - (BOOL) isError
-{return YES;
+{
     return fStat->error != 0;
 }

trunk/macosx/TorrentCell.h

@@ -23 +23 @@
  *****************************************************************************/
 
-#import "CTGradient.h"
+@class CTGradient;
 
 @interface TorrentCell : NSCell

trunk/macosx/TorrentTableView.m

@@ -508 +508 @@
     if (row < 0 || ![fDefaults boolForKey: @"SmallView"])
         return NO;
-
-    Torrent * torrent = [fTorrents objectAtIndex: row];
-    NSString * statusString = ![fDefaults boolForKey: @"SmallStatusRegular"] && [torrent isActive]
-                                    ? [torrent remainingTimeString] : [torrent shortStatusString];
-    
-    float statusWidth = [statusString sizeWithAttributes: fSmallStatusAttributes].width + 3.0;
-    
-    NSRect cellRect = [self frameOfCellAtColumn: [self columnWithIdentifier: @"Torrent"] row: row];
-    NSRect statusRect = NSMakeRect(NSMaxX(cellRect) - statusWidth, cellRect.origin.y,
-                                    statusWidth, cellRect.size.height - BUTTON_WIDTH);
-    
-    return NSPointInRect(point, statusRect);
+    
+    TorrentCell * cell = [[self tableColumnWithIdentifier: @"Torrent"] dataCell];
+    [cell setRepresentedObject: [fTorrents objectAtIndex: row]];
+    return NSPointInRect(point, [cell minimalStatusRectForBounds: [self frameOfCellAtColumn: 0 row: row]]);
 }