[attributedlabel] Ignored typographic-leading to evaluate _rectForRan…

…ge:inLine:lineOrigin: for Japanese-character link.
derekzhang79 · Aug 31, 2012 · c777729 · c777729
1 parent 74f37b3
commit c777729
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/examples/catalog/Catalog/LinksAttributedLabelViewController.m b/examples/catalog/Catalog/LinksAttributedLabelViewController.m
@@ -83,7 +83,7 @@ - (void)viewDidLoad {
   @"\nSigned beneath the image: tenach.deviantart.com"
 
   // Japanese
-  @"\n\n\nこんにちは、ニンバス！これはBugテストです。";
+  @"\n\n\nこんにちは、ニンバス！これはテストです。";
 
   NSRange linkRange = [label.text rangeOfString:@"an artist's rendition of the planet"];
 

diff --git a/src/attributedlabel/src/NIAttributedLabel.m b/src/attributedlabel/src/NIAttributedLabel.m
@@ -727,11 +727,13 @@ - (CGRect)_rectForRange:(NSRange)range inLine:(CTLineRef)line lineOrigin:(CGPoin
     CGFloat ascent = 0.0f;
     CGFloat descent = 0.0f;
     CGFloat leading = 0.0f;
+
+    // Use of 'leading' doesn't properly highlight Japanese-character link.
     CGFloat width = (CGFloat)CTRunGetTypographicBounds(run,
                                                        CFRangeMake(0, 0),
                                                        &ascent,
                                                        &descent,
-                                                       &leading);
+                                                       NULL); //&leading);
     CGFloat height = ascent + descent;
 
     CGFloat xOffset = CTLineGetOffsetForStringIndex(line, CTRunGetStringRange(run).location, nil);