Use drawAtPoint:forWidth:withFont:lineBreakMode: instead of drawAtPoint:forWidth...

diff --git a/Cydia.mm b/Cydia.mm
index efbb9b83afb866794315bc7123d6dca5a1e2d096..9e12518f88f98b6d2274b993687dba7fb180b8f3 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -4829,12 +4829,12 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     if (!selected)
         UISetColor(commercial_ ? Purple_ : Black_);
 
     if (!selected)
         UISetColor(commercial_ ? Purple_ : Black_);

-    [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ ellipsis:2];
-    [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ ellipsis:2];
+    [name_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - (placard_ == nil ? 80 : 106)) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];
+    [source_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];

 
     if (!selected)
         UISetColor(commercial_ ? Purplish_ : Gray_);
 
     if (!selected)
         UISetColor(commercial_ ? Purplish_ : Gray_);

-    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ ellipsis:2];
+    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 46) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation];

 
     if (placard_ != nil)
         [placard_ drawAtPoint:CGPointMake(width - 52, 9)];
 
     if (placard_ != nil)
         [placard_ drawAtPoint:CGPointMake(width - 52, 9)];


@@ -4988,7 +4988,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (editing_)
         width -= 87;
 
     if (editing_)
         width -= 87;
 

-    [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ ellipsis:2];
+    [name_ drawAtPoint:CGPointMake(48, 9) forWidth:(width - 70) withFont:Font22Bold_ lineBreakMode:UILineBreakModeTailTruncation];

 
     CGSize size = [count_ sizeWithFont:Font14_];
 
 
     CGSize size = [count_ sizeWithFont:Font14_];
 


@@ -5750,15 +5750,15 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
     if (!selected)
         UISetColor(Black_);
 
     if (!selected)
         UISetColor(Black_);

-    [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 80) withFont:Font18Bold_ ellipsis:2];
+    [origin_ drawAtPoint:CGPointMake(48, 8) forWidth:(width - 80) withFont:Font18Bold_ lineBreakMode:UILineBreakModeTailTruncation];

 
     if (!selected)
         UISetColor(Blue_);
 
     if (!selected)
         UISetColor(Blue_);

-    [label_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ ellipsis:2];
+    [label_ drawAtPoint:CGPointMake(58, 29) forWidth:(width - 95) withFont:Font12_ lineBreakMode:UILineBreakModeTailTruncation];

 
     if (!selected)
         UISetColor(Gray_);
 
     if (!selected)
         UISetColor(Gray_);

-    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 40) withFont:Font14_ ellipsis:2];
+    [description_ drawAtPoint:CGPointMake(12, 46) forWidth:(width - 40) withFont:Font14_ lineBreakMode:UILineBreakModeTailTruncation];

 }
 
 @end
 }
 
 @end

diff --git a/iPhonePrivate.h b/iPhonePrivate.h
index bf49914445e152ea3d462e8c154964cb69e8c636..589dcf3f79e1e799a5c239a7e0741081826958bc 100644 (file)
--- a/iPhonePrivate.h
+++ b/iPhonePrivate.h
@@ -34,7 +34,6 @@ typedef enum {
 
 
 @interface NSString (Apple)
 
 
 @interface NSString (Apple)

-- (void) drawAtPoint:(CGPoint)point forWidth:(float)width withFont:(UIFont *)font ellipsis:(NSInteger)ellipsis;

 - (NSString *) stringByAddingPercentEscapes;
 - (NSString *) stringByReplacingCharacter:(UniChar)from withCharacter:(UniChar)to;
 @end
 - (NSString *) stringByAddingPercentEscapes;
 - (NSString *) stringByReplacingCharacter:(UniChar)from withCharacter:(UniChar)to;
 @end