Changeset 6269

Timestamp:

Jun 30, 2008, 7:52:18 PM (15 years ago)

Author:

livings124

Message:

#1065 QL Zooming in the inspector wasn't zooming to the icon

Location:

trunk/macosx

Files:

• FileOutlineView.m (modified) (1 diff)
• NSStringAdditions.m (modified) (2 diffs)

trunk/macosx/FileOutlineView.m

@@ -117 +117 @@
 - (NSRect) iconRectForRow: (int) row
 {
-    FileNameCell * cell = (FileNameCell *)[[self tableColumnWithIdentifier: @"Name"] dataCell];
-    return [cell imageRectForBounds: [self rectOfRow: row]];
+    FileNameCell * cell = (FileNameCell *)[self preparedCellAtColumn: [self columnWithIdentifier: @"Name"] row: row];
+    NSRect iconRect = [cell imageRectForBounds: [self rectOfRow: row]];
+    
+    iconRect.origin.x += [self frameOfOutlineCellAtRow: row].size.width;
+    iconRect.origin.x += [self indentationPerLevel] * (float)([self levelForRow: row] + ([[self itemAtRow: row] isFolder] ? 0 : 1));
+    return iconRect;
 }
 

trunk/macosx/NSStringAdditions.m

@@ -151 +151 @@
                                                             | NSWidthInsensitiveSearch | NSForcedOrderingSearch)
                                                         : (NSCaseInsensitiveSearch | NSNumericSearch);
-    
     return [self compare: string options: comparisonOptions range: NSMakeRange(0, [self length]) locale: [NSLocale currentLocale]];
 }
@@ -158 +157 @@
 {
     int comparisonOptions = [NSApp isOnLeopardOrBetter] ? (NSNumericSearch | NSForcedOrderingSearch) : NSNumericSearch;
-    
     return [self compare: string options: comparisonOptions range: NSMakeRange(0, [self length]) locale: [NSLocale currentLocale]];
 }