Merge pull request #1079 from aaronschubert0/ASTextNode-Fix-for-layout-bug

appleguy · appleguy · commit 44aae77ef408 · 2016-01-19T19:23:19.000-08:00
[ASTextKitRenderer] Potential fix headIndent attribute not being accounted for by the shadower.
diff --git a/AsyncDisplayKit/TextKit/ASTextKitRenderer.mm b/AsyncDisplayKit/TextKit/ASTextKitRenderer.mm
@@ -111,7 +111,7 @@ - (void)_calculateSize
   // to make sure our width calculations aren't being offset by glyphs going beyond the constrained rect.
   boundingRect = CGRectIntersection(boundingRect, {.size = constrainedRect.size});
 
-  _calculatedSize = [_shadower outsetSizeWithInsetSize:boundingRect.size];
+  _calculatedSize = [_shadower outsetSizeWithInsetSize:CGSizeMake(boundingRect.size.width + boundingRect.origin.x, boundingRect.size.height + boundingRect.origin.y)];
 }
 
 - (CGSize)size

Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ - (void)_calculateSize`
`111`	`111`	`// to make sure our width calculations aren't being offset by glyphs going beyond the constrained rect.`
`112`	`112`	`boundingRect = CGRectIntersection(boundingRect, {.size = constrainedRect.size});`
`113`	`113`
`114`		`- _calculatedSize = [_shadower outsetSizeWithInsetSize:boundingRect.size];`
	`114`	`+ _calculatedSize = [_shadower outsetSizeWithInsetSize:CGSizeMake(boundingRect.size.width + boundingRect.origin.x, boundingRect.size.height + boundingRect.origin.y)];`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`- (CGSize)size`