Changeset 9828

Timestamp:

Dec 27, 2009, 7:30:20 PM (12 years ago)

Author:

livings124

Message:

avoid needlessly copying the folder icon

Location:

trunk/macosx

Files:

• FileListNode.m (modified) (1 diff)
• FileNameCell.h (modified) (1 diff)
• FileNameCell.m (modified) (3 diffs)

trunk/macosx/FileListNode.m

@@ -116 +116 @@
 - (NSImage *) icon
 {
-    if (!fIsFolder && !fIcon)
-        fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: [fName pathExtension]] retain];
+    if (!fIcon)
+        fIcon = [[[NSWorkspace sharedWorkspace] iconForFileType: fIsFolder ? NSFileTypeForHFSTypeCode('fldr')
+                                                                            : [fName pathExtension]] retain];
     return fIcon;
 }

trunk/macosx/FileNameCell.h

@@ -27 +27 @@
 @interface FileNameCell : NSActionCell
 {
-    NSImage * fFolderImage;
-    
     NSMutableDictionary * fTitleAttributes, * fStatusAttributes;
 }

trunk/macosx/FileNameCell.m

@@ -75 +75 @@
     [fStatusAttributes release];
     
-    [fFolderImage release];
-    
     [super dealloc];
 }
@@ -87 +85 @@
     copy->fStatusAttributes = [fStatusAttributes retain];
     
-    copy->fFolderImage = [fFolderImage retain];
-    
     return copy;
 }
@@ -95 +91 @@
 {
     FileListNode * node = (FileListNode *)[self objectValue];
-    NSImage * image;
-    if ([node isFolder])
-    {
-        if (!fFolderImage)
-            fFolderImage = [[[NSWorkspace sharedWorkspace] iconForFileType: NSFileTypeForHFSTypeCode('fldr')] copy];
-        image = fFolderImage;
-    }
-    else
-        image = [node icon];
-    
-    return image;
+    return [node icon];
 }