From a9d0542d8f3c9ee4a6fa6dfa0052a563f964485d Mon Sep 17 00:00:00 2001 From: Michael Schneider Date: Wed, 13 Apr 2016 16:55:55 -0700 Subject: [PATCH] If trailing rect was set early return --- AsyncDisplayKit/TextKit/ASTextKitRenderer+Positioning.mm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AsyncDisplayKit/TextKit/ASTextKitRenderer+Positioning.mm b/AsyncDisplayKit/TextKit/ASTextKitRenderer+Positioning.mm index 25fe7b54c8..d1ba55123c 100755 --- a/AsyncDisplayKit/TextKit/ASTextKitRenderer+Positioning.mm +++ b/AsyncDisplayKit/TextKit/ASTextKitRenderer+Positioning.mm @@ -345,6 +345,11 @@ static const CGFloat ASTextKitRendererTextCapHeightPadding = 1.3; textRange = NSMakeRange([textStorage length] - 1, 1); }]; + + // If trailing rect was set early return here + if (!CGRectEqualToRect(trailingRect, CGRectNull)) { + return trailingRect; + } // Take everything after our final character as trailing space. NSArray *finalRects = [self rectsForTextRange:textRange measureOption:ASTextKitRendererMeasureOptionLineHeight];