Changeset 5945

Timestamp:

May 27, 2008, 6:05:05 AM (14 years ago)

Author:

livings124

Message:

allow transfers to be dragged when status fields are hit; trivial efficiency improvements when drawing torrent cells

File:

• trunk/macosx/TorrentCell.m (modified) (7 diffs)

trunk/macosx/TorrentCell.m

@@ -164 +164 @@
 - (NSRect) minimalStatusRectForBounds: (NSRect) bounds
 {
+    if (![fDefaults boolForKey: @"SmallView"])
+        return NSZeroRect;
+    
     return [self rectForMinimalStatusWithString: [self attributedStatusString: [self minimalStatusString] withColor: nil]
             inBounds: bounds];
@@ -170 +173 @@
 - (NSRect) progressRectForBounds: (NSRect) bounds
 {
+    if ([fDefaults boolForKey: @"SmallView"])
+        return NSZeroRect;
+    
     return [self rectForProgressWithString: [self attributedStatusString: [[self representedObject] progressString] withColor: nil]
             inBounds: bounds];
@@ -195 +201 @@
 - (NSRect) statusRectForBounds: (NSRect) bounds
 {
+    if ([fDefaults boolForKey: @"SmallView"])
+        return NSZeroRect;
+    
     return [self rectForStatusWithString: [self attributedStatusString: [self statusString] withColor: nil] inBounds: bounds];
 }
@@ -249 +258 @@
     
     if (NSMouseInRect(point, [self controlButtonRectForBounds: cellFrame], [controlView isFlipped])
-        || NSMouseInRect(point, [self revealButtonRectForBounds: cellFrame], [controlView isFlipped])
-        || (NSMouseInRect(point, [self progressRectForBounds: cellFrame], [controlView isFlipped]) && [[self representedObject] folder])
-        || NSMouseInRect(point, [self minimalStatusRectForBounds: cellFrame], [controlView isFlipped]))
+        || NSMouseInRect(point, [self revealButtonRectForBounds: cellFrame], [controlView isFlipped]))
         return NSCellHitContentArea | NSCellHitTrackableArea;
     
@@ -779 +786 @@
 - (NSRect) rectForMinimalStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds
 {
-    if (![fDefaults boolForKey: @"SmallView"])
-        return NSZeroRect;
-    
     NSRect result = bounds;
     result.size = [string size];
@@ -809 +813 @@
 - (NSRect) rectForProgressWithString: (NSAttributedString *) string inBounds: (NSRect) bounds
 {
-    if ([fDefaults boolForKey: @"SmallView"])
-        return NSZeroRect;
-    
     NSRect result = bounds;
     result.origin.y += PADDING_ABOVE_TITLE + HEIGHT_TITLE + PADDING_BETWEEN_TITLE_AND_PROGRESS;
@@ -824 +825 @@
 - (NSRect) rectForStatusWithString: (NSAttributedString *) string inBounds: (NSRect) bounds
 {
-    if ([fDefaults boolForKey: @"SmallView"])
-        return NSZeroRect;
-    
     NSRect result = bounds;
     result.origin.y += PADDING_ABOVE_TITLE + HEIGHT_TITLE + PADDING_BETWEEN_TITLE_AND_PROGRESS + HEIGHT_STATUS