Truncate details using NSLineBreakByTruncatingMiddle

Fixes quicksilver#525
pjrobertson · Oct 16, 2012 · ce9e6e6 · ce9e6e6
1 parent 0ed19f0
commit ce9e6e6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 424 deletions.
diff --git a/Quicksilver/Code-QuickStepInterface/QSObjectCell.h b/Quicksilver/Code-QuickStepInterface/QSObjectCell.h
@@ -17,7 +17,6 @@
 	NSDictionary *nameAttributes;
 	NSDictionary *detailsAttributes;
     NSDictionary *rankedNameAttributes;
-	NSRect lastFrame;
 	NSTextView *fieldEditor;
 }
 

diff --git a/Quicksilver/Code-QuickStepInterface/QSObjectCell.m b/Quicksilver/Code-QuickStepInterface/QSObjectCell.m
@@ -389,7 +389,7 @@ - (void)drawIconForObject:(QSObject *)object withFrame:(NSRect)cellFrame inView:
 - (void)buildStylesForFrame:(NSRect)cellFrame inView:(NSView *)controlView {
 
 	NSMutableParagraphStyle *style = [[[NSMutableParagraphStyle alloc] init] autorelease];
-	[style setLineBreakMode:NSLineBreakByTruncatingTail];
+	[style setLineBreakMode:NSLineBreakByTruncatingMiddle];
 	[style setFirstLineHeadIndent:1.0];
 	[style setHeadIndent:1.0];
 	[style setAlignment:[self alignment]];
@@ -498,12 +498,9 @@ - (void)drawTextForObject:(QSObject *)drawObject withFrame:(NSRect)cellFrame inV
 
                 CGFloat detailHeight = NSHeight(textDrawRect) -nameSize.height;
                 NSRange returnRange;
-                if (detailHeight<detailsSize.height && (returnRange = [detailsString rangeOfString:@"\n"]) .location != NSNotFound)
+                if (detailHeight<detailsSize.height && (returnRange = [detailsString rangeOfString:@"\n"]) .location != NSNotFound) {
                     detailsString = [detailsString substringToIndex:returnRange.location];
-                if ([detailsString length] >100) detailsString = [detailsString substringWithRange:NSMakeRange(0, 100)];
+                }
-                // ***warning  ** this should take first line only?
-                //if ([titleString length]) [titleString appendAttributedString:;
-
             }
         }