Changeset 56 for trunk/macosx/NameCell.m

Timestamp:

Jan 29, 2006, 7:18:03 PM (17 years ago)

Author:

titer

Message:

Show the file icon in the "Name" cell
Changed 0.5-cvs to 0.5-svn

File:

• trunk/macosx/NameCell.m (modified) (4 diffs)

trunk/macosx/NameCell.m

@@ -34 +34 @@
     fSizeString  = [NSString stringWithFormat: @" (%@)",
                     [NSString stringForFileSize: stat->info.totalSize]];
+
+    fIcon = [[NSWorkspace sharedWorkspace] iconForFile:
+                [[NSString stringWithUTF8String: stat->folder]
+                stringByAppendingPathComponent: fNameString]];                  
+    [fIcon setFlipped: YES];
+
     fTimeString  = @"";
     fPeersString = @"";
@@ -98 +104 @@
 
     pen = cellFrame.origin;
+    float cellWidth = cellFrame.size.width;
+
+    pen.x += 5;
+    pen.y += 5;                                                                 
+    [fIcon drawAtPoint: pen fromRect:
+        NSMakeRect(0,0,[fIcon size].width,[fIcon size].height)
+        operation: NSCompositeSourceOver fraction: 1.0];
 
     attributes = [NSMutableDictionary dictionaryWithCapacity: 2];
@@ -106 +119 @@
         forKey: NSFontAttributeName];
 
-    pen.x += 5; pen.y += 5;
-    string = [[fNameString stringFittingInWidth: cellFrame.size.width -
-        35 - [fSizeString sizeWithAttributes: attributes].width
+    pen.x += 37;
+    string = [[fNameString stringFittingInWidth: cellWidth -
+        72 - [fSizeString sizeWithAttributes: attributes].width
         withAttributes: attributes] stringByAppendingString: fSizeString];
     [string drawAtPoint: pen withAttributes: attributes];
@@ -120 +133 @@
     pen.x += 0; pen.y += 15;
     string = [fPeersString stringFittingInWidth: cellFrame.size.width -
-        40 withAttributes: attributes];
+        77 withAttributes: attributes];
     [string drawAtPoint: pen withAttributes: attributes];