Changeset 10975

Timestamp:

Jul 8, 2010, 1:49:41 AM (12 years ago)

Author:

livings124

Message:

adjust the code for determining the layout of text in the file table

File:

• trunk/macosx/FileNameCell.m (modified) (5 diffs)

trunk/macosx/FileNameCell.m

@@ -64 +64 @@
                             paragraphStyle, NSParagraphStyleAttributeName, nil];
         
+        NSMutableParagraphStyle * statusParagraphStyle = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
+        [statusParagraphStyle setLineBreakMode: NSLineBreakByTruncatingTail];
+        
         fStatusAttributes = [[NSMutableDictionary alloc] initWithObjectsAndKeys:
                                 [NSFont messageFontOfSize: 9.0], NSFontAttributeName,
-                                paragraphStyle, NSParagraphStyleAttributeName, nil];
+                                statusParagraphStyle, NSParagraphStyleAttributeName,  nil];
         
         [paragraphStyle release];
@@ -161 +164 @@
         result.origin.x = NSMinX(bounds) + PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE;
         result.origin.y = NSMinY(bounds) + PADDING_ABOVE_TITLE_FILE;
+        result.size.width = NSMaxX(bounds) - NSMinX(result) - PADDING_HORIZONAL;
     }
     else
@@ -166 +170 @@
         result.origin.x = NSMinX(bounds) + PADDING_HORIZONAL + IMAGE_FOLDER_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE;
         result.origin.y = NSMidY(bounds) - titleSize.height * 0.5;
+        result.size.width = MIN(titleSize.width, NSMaxX(bounds) - NSMinX(result) - PADDING_HORIZONAL);
     }
     result.size.height = titleSize.height;
-    result.size.width = MIN(titleSize.width, NSMaxX(bounds) - NSMinX(result) - PADDING_HORIZONAL);
     
     return result;
@@ -180 +184 @@
     if (![(FileListNode *)[self objectValue] isFolder])
     {
-        result.origin.x = NSMinX(bounds) + PADDING_HORIZONAL + IMAGE_ICON_SIZE + PADDING_BETWEEN_IMAGE_AND_TITLE;
+        result.origin.x = NSMinX(titleRect);
         result.origin.y = NSMaxY(bounds) - PADDING_BELOW_STATUS_FILE - statusSize.height;
+        result.size.width = NSWidth(titleRect);
     }
     else
@@ -187 +192 @@
         result.origin.x = NSMaxX(titleRect) + PADDING_BETWEEN_NAME_AND_FOLDER_STATUS;
         result.origin.y = NSMaxY(titleRect) - statusSize.height - 1.0;
-    }
-        
+        result.size.width = NSMaxX(bounds) - NSMaxX(titleRect) - PADDING_HORIZONAL;
+    }
     result.size.height = statusSize.height;
-    result.size.width = NSMaxX(bounds) - NSMaxX(result) - PADDING_HORIZONAL;
     
     return result;