Changeset 340

Timestamp:

Jun 12, 2006, 3:26:24 PM (17 years ago)

Author:

livings124

Message:

Double-clicking the icon in the table view will reveal the download.

Location:

trunk/macosx

Files:

• TorrentCell.m (modified) (2 diffs)
• TorrentTableView.h (modified) (1 diff)
• TorrentTableView.m (modified) (4 diffs)

trunk/macosx/TorrentCell.m

@@ -24 +24 @@
 
 #import "TorrentCell.h"
+#import "TorrentTableView.h"
 #import "StringAdditions.h"
 
@@ -270 +271 @@
     pen.y += [progressString size].height + linePadding;
     
-    float barWidth = mainWidth + extraNameShift - 42.0 + padding;
+    float barWidth = mainWidth + extraNameShift - BUTTONS_TOTAL_WIDTH + padding;
     
     NSBitmapImageRep * bitmap = [[NSBitmapImageRep alloc]

trunk/macosx/TorrentTableView.h

@@ -26 +26 @@
 #import <transmission.h>
 
+#define BUTTONS_TOTAL_WIDTH 42.0
+
 @class Controller;
 

trunk/macosx/TorrentTableView.m

@@ -30 +30 @@
 #define BUTTON_WIDTH 14.0
 #define BUTTON_TO_TOP 33.5
+#define DISTANCE_FROM_CENTER 2.5
+//change BUTTONS_TOTAL_WIDTH when changing this
 #define AREA_CENTER 21.0
-#define DISTANCE_FROM_CENTER 2.5
 
 @interface TorrentTableView (Private)
@@ -39 +40 @@
 - (BOOL) pointInPauseRect: (NSPoint) point;
 - (BOOL) pointInRevealRect: (NSPoint) point;
+- (BOOL) pointInIconRect: (NSPoint) point;
 
 @end
@@ -97 +99 @@
     else if( sameRow && [self pointInRevealRect: point]
                 && [self pointInRevealRect: fClickPoint] )
-    {
-        torrent = [fTorrents objectAtIndex: row];
-        [torrent reveal];
-    }
+        [[fTorrents objectAtIndex: row] reveal];
         else
         if ([e clickCount] == 2)
-            [fController showInfo: nil];
+        {
+            if ([self pointInIconRect: point])
+                [[fTorrents objectAtIndex: row] reveal];
+            else
+                [fController showInfo: nil];
+        }
     
         [super mouseUp: e];
@@ -206 +210 @@
 }
 
+- (BOOL) pointInIconRect: (NSPoint) point
+{
+    int row = [self rowAtPoint: point];
+    NSRect cellRect = [self frameOfCellAtColumn:
+                [self columnWithIdentifier: @"Torrent"] row: row];
+    NSSize iconSize = [[[fTorrents objectAtIndex: row] iconFlipped] size];
+    
+    NSRect iconRect = NSMakeRect(cellRect.origin.x + 3.0, cellRect.origin.y
+                        + (cellRect.size.height - iconSize.height) * 0.5,
+                        iconSize.width, iconSize.height);
+    
+    return NSPointInRect(point, iconRect);
+}
+
 - (BOOL) pointInPauseRect: (NSPoint) point
 {