Use core layoutSublayouts method for layout step

This commit is contained in:
Levi McCallum
2016-02-10 10:01:38 -08:00
parent e57761ffbe
commit d669cadcba
2 changed files with 2 additions and 10 deletions

View File

@@ -2172,15 +2172,7 @@ void recursivelyTriggerDisplayForLayer(CALayer *layer, BOOL shouldBlock)
return;
}
if ([[self class] usesImplicitHierarchyManagement]) {
[self __layoutSublayouts];
} else {
// Assume that _layout was flattened and is 1-level deep.
for (ASLayout *subnodeLayout in _layout.sublayouts) {
ASDisplayNodeAssert([_subnodes containsObject:subnodeLayout.layoutableObject], @"Sublayouts must only contain subnodes' layout. self = %@, subnodes = %@", self, _subnodes);
((ASDisplayNode *)subnodeLayout.layoutableObject).frame = [subnodeLayout frame];
}
}
[self __layoutSublayouts];
}
- (void)__layoutSublayouts

View File

@@ -42,7 +42,7 @@
- (CGRect)finalFrameForNode:(ASDisplayNode *)node
{
for (ASLayout *layout in _layout.immediateSublayouts) {
for (ASLayout *layout in _layout.sublayouts) {
if (layout.layoutableObject == node) {
return [layout frame];
}