Rename ASLayoutNode's -computeLayoutThatFits to -calculateLayoutThatFits.

This commit is contained in:
Huy Nguyen
2015-06-24 21:08:03 +07:00
parent 4ad64b2841
commit 810bc3ab84
13 changed files with 23 additions and 23 deletions

View File

@@ -1271,7 +1271,7 @@ static NSInteger incrementIfFound(NSInteger i) {
{
ASDisplayNodeAssertThreadAffinity(self);
ASLayoutNode *layoutNode = [self layoutNodeThatFits:constrainedSize];
ASLayout *layout = [layoutNode computeLayoutThatFits:{CGSizeZero, constrainedSize}];
ASLayout *layout = [layoutNode calculateLayoutThatFits:{CGSizeZero, constrainedSize}];
return layout;
}

View File

@@ -43,14 +43,14 @@
/**
First layout the contents, then fit the background image.
*/
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
{
ASLayout *contentsLayout = [_node computeLayoutThatFits:constrainedSize];
ASLayout *contentsLayout = [_node calculateLayoutThatFits:constrainedSize];
NSMutableArray *children = [NSMutableArray arrayWithCapacity:2];
if (_background) {
// Size background to exactly the same size.
ASLayout *backgroundLayout = [_background computeLayoutThatFits:{contentsLayout.size, contentsLayout.size}];
ASLayout *backgroundLayout = [_background calculateLayoutThatFits:{contentsLayout.size, contentsLayout.size}];
[children addObject:[ASLayoutChild newWithPosition:{0,0} layout:backgroundLayout]];
}
[children addObject:[ASLayoutChild newWithPosition:{0,0} layout:contentsLayout]];

View File

@@ -38,7 +38,7 @@
ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER();
}
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
{
CGSize size = {
constrainedSize.max.width,
@@ -50,7 +50,7 @@
(_centeringOptions & ASCenterLayoutNodeCenteringX) != 0 ? 0 : constrainedSize.min.width,
(_centeringOptions & ASCenterLayoutNodeCenteringY) != 0 ? 0 : constrainedSize.min.height,
};
ASLayout *childLayout = [_child computeLayoutThatFits:ASSizeRangeMake(minChildSize, constrainedSize.max)];
ASLayout *childLayout = [_child calculateLayoutThatFits:ASSizeRangeMake(minChildSize, constrainedSize.max)];
// If we have an undetermined height or width, use the child size to define the layout
// size

View File

@@ -34,7 +34,7 @@
ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER();
}
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
{
CGSize measuredSize = ASSizeRangeClamp(constrainedSize, [_displayNode measure:constrainedSize.max]);
return [ASLayout newWithNode:self size:measuredSize];

View File

@@ -65,7 +65,7 @@ static CGFloat centerInset(CGFloat outer, CGFloat inner)
Inset will compute a new constrained size for it's child after applying insets and re-positioning
the child to respect the inset.
*/
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
{
const CGFloat insetsX = (finiteOrZero(_insets.left) + finiteOrZero(_insets.right));
const CGFloat insetsY = (finiteOrZero(_insets.top) + finiteOrZero(_insets.bottom));
@@ -85,7 +85,7 @@ static CGFloat centerInset(CGFloat outer, CGFloat inner)
MAX(0, constrainedSize.max.height - insetsY),
}
};
ASLayout *childLayout = [_node computeLayoutThatFits:insetConstrainedSize];
ASLayout *childLayout = [_node calculateLayoutThatFits:insetConstrainedSize];
const CGSize computedSize = ASSizeRangeClamp(constrainedSize, {
finite(childLayout.size.width + _insets.left + _insets.right, constrainedSize.max.width),

View File

@@ -21,7 +21,7 @@
#pragma mark - Layout
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
{
return [ASLayout newWithNode:self size:constrainedSize.min];
}

View File

@@ -14,12 +14,12 @@
@interface ASLayoutNode ()
/**
Override this method to compute your node's layout.
Override this method to calculate your node's layout.
@param constrainedSize @param constrainedSize The maximum size the receiver should fit in.
@param constrainedSize The maximum size the receiver should fit in.
@return An ASLayout instance defining the layout of the receiver and its children.
*/
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize;
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize;
@end

View File

@@ -40,12 +40,12 @@
/**
First layout the contents, then fit the overlay on top of it.
*/
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
{
ASLayout *contentsLayout = [_node computeLayoutThatFits:constrainedSize];
ASLayout *contentsLayout = [_node calculateLayoutThatFits:constrainedSize];
NSMutableArray *layoutChildren = [NSMutableArray arrayWithObject:[ASLayoutChild newWithPosition:{0, 0} layout:contentsLayout]];
if (_overlay) {
ASLayout *overlayLayout = [_overlay computeLayoutThatFits:{contentsLayout.size, contentsLayout.size}];
ASLayout *overlayLayout = [_overlay calculateLayoutThatFits:{contentsLayout.size, contentsLayout.size}];
[layoutChildren addObject:[ASLayoutChild newWithPosition:{0, 0} layout:overlayLayout]];
}

View File

@@ -46,7 +46,7 @@
ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER();
}
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
{
std::vector<CGSize> sizeOptions;
if (!isinf(constrainedSize.max.width)) {
@@ -69,7 +69,7 @@
// If there is no max size in *either* dimension, we can't apply the ratio, so just pass our size range through.
const ASSizeRange childRange = (bestSize == sizeOptions.end()) ? constrainedSize : ASSizeRangeMake(*bestSize, *bestSize);
ASLayout *childLayout = [_node computeLayoutThatFits:childRange];
ASLayout *childLayout = [_node calculateLayoutThatFits:childRange];
return [ASLayout newWithNode:self
size:childLayout.size
children:@[[ASLayoutChild newWithPosition:{0, 0} layout:childLayout]]];

View File

@@ -119,7 +119,7 @@
ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER();
}
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
{
const auto unpositionedLayout = ASStackUnpositionedLayout::compute(_children, _style, constrainedSize);
const auto positionedLayout = ASStackPositionedLayout::compute(unpositionedLayout, _style, constrainedSize);

View File

@@ -53,7 +53,7 @@
ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER();
}
- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize
- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize
{
CGSize size = {
constrainedSize.max.width,
@@ -68,7 +68,7 @@
};
ASSizeRange childConstraint = ASRelativeSizeRangeResolveSizeRange(child.size, size, {{0,0}, autoMaxSize});
ASLayoutChild *layoutChild = [ASLayoutChild newWithPosition:child.position
layout:[child.node computeLayoutThatFits:childConstraint]];
layout:[child.node calculateLayoutThatFits:childConstraint]];
[layoutChildren addObject:layoutChild];
}

View File

@@ -30,7 +30,7 @@ static ASLayout *crossChildLayout(const ASStackLayoutNodeChild *child,
// stretched children will have a cross dimension of at least crossMin
const CGFloat childCrossMin = alignItems == ASStackLayoutAlignItemsStretch ? crossMin : 0;
const ASSizeRange childSizeRange = directionSizeRange(style.direction, stackMin, stackMax, childCrossMin, crossMax);
return [child.node computeLayoutThatFits:childSizeRange];
return [child.node calculateLayoutThatFits:childSizeRange];
}
/**

View File

@@ -50,7 +50,7 @@
- (void)setLayoutNodeUnderTest:(ASLayoutNode *)layoutNodeUnderTest sizeRange:(ASSizeRange)sizeRange
{
_layoutUnderTest = [layoutNodeUnderTest computeLayoutThatFits:sizeRange];
_layoutUnderTest = [layoutNodeUnderTest calculateLayoutThatFits:sizeRange];
self.frame = CGRectMake(0, 0, _layoutUnderTest.size.width, _layoutUnderTest.size.height);
[self measure:_layoutUnderTest.size];
}