From 810bc3ab84ae5eca6372d2c373da7763fcb1a0e2 Mon Sep 17 00:00:00 2001 From: Huy Nguyen Date: Wed, 24 Jun 2015 21:08:03 +0700 Subject: [PATCH] Rename ASLayoutNode's -computeLayoutThatFits to -calculateLayoutThatFits. --- AsyncDisplayKit/ASDisplayNode.mm | 2 +- AsyncDisplayKit/Layout/ASBackgroundLayoutNode.mm | 6 +++--- AsyncDisplayKit/Layout/ASCenterLayoutNode.mm | 4 ++-- AsyncDisplayKit/Layout/ASCompositeNode.mm | 2 +- AsyncDisplayKit/Layout/ASInsetLayoutNode.mm | 4 ++-- AsyncDisplayKit/Layout/ASLayoutNode.mm | 2 +- AsyncDisplayKit/Layout/ASLayoutNodeSubclass.h | 6 +++--- AsyncDisplayKit/Layout/ASOverlayLayoutNode.mm | 6 +++--- AsyncDisplayKit/Layout/ASRatioLayoutNode.mm | 4 ++-- AsyncDisplayKit/Layout/ASStackLayoutNode.mm | 2 +- AsyncDisplayKit/Layout/ASStaticLayoutNode.mm | 4 ++-- AsyncDisplayKit/Private/ASStackUnpositionedLayout.mm | 2 +- AsyncDisplayKitTests/ASLayoutNodeSnapshotTestsHelper.m | 2 +- 13 files changed, 23 insertions(+), 23 deletions(-) diff --git a/AsyncDisplayKit/ASDisplayNode.mm b/AsyncDisplayKit/ASDisplayNode.mm index db96f3c0a2..409260b40e 100644 --- a/AsyncDisplayKit/ASDisplayNode.mm +++ b/AsyncDisplayKit/ASDisplayNode.mm @@ -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; } diff --git a/AsyncDisplayKit/Layout/ASBackgroundLayoutNode.mm b/AsyncDisplayKit/Layout/ASBackgroundLayoutNode.mm index 301ec7b199..f853a2094e 100644 --- a/AsyncDisplayKit/Layout/ASBackgroundLayoutNode.mm +++ b/AsyncDisplayKit/Layout/ASBackgroundLayoutNode.mm @@ -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]]; diff --git a/AsyncDisplayKit/Layout/ASCenterLayoutNode.mm b/AsyncDisplayKit/Layout/ASCenterLayoutNode.mm index 6fe78cfcab..0a72518754 100644 --- a/AsyncDisplayKit/Layout/ASCenterLayoutNode.mm +++ b/AsyncDisplayKit/Layout/ASCenterLayoutNode.mm @@ -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 diff --git a/AsyncDisplayKit/Layout/ASCompositeNode.mm b/AsyncDisplayKit/Layout/ASCompositeNode.mm index 3c96af52b2..38e3d593fc 100644 --- a/AsyncDisplayKit/Layout/ASCompositeNode.mm +++ b/AsyncDisplayKit/Layout/ASCompositeNode.mm @@ -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]; diff --git a/AsyncDisplayKit/Layout/ASInsetLayoutNode.mm b/AsyncDisplayKit/Layout/ASInsetLayoutNode.mm index 89d3d8326b..7b19ca3af9 100644 --- a/AsyncDisplayKit/Layout/ASInsetLayoutNode.mm +++ b/AsyncDisplayKit/Layout/ASInsetLayoutNode.mm @@ -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), diff --git a/AsyncDisplayKit/Layout/ASLayoutNode.mm b/AsyncDisplayKit/Layout/ASLayoutNode.mm index 2cd43b03e7..4bd04d4b4d 100644 --- a/AsyncDisplayKit/Layout/ASLayoutNode.mm +++ b/AsyncDisplayKit/Layout/ASLayoutNode.mm @@ -21,7 +21,7 @@ #pragma mark - Layout -- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize +- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize { return [ASLayout newWithNode:self size:constrainedSize.min]; } diff --git a/AsyncDisplayKit/Layout/ASLayoutNodeSubclass.h b/AsyncDisplayKit/Layout/ASLayoutNodeSubclass.h index 340d136aee..3316397f13 100644 --- a/AsyncDisplayKit/Layout/ASLayoutNodeSubclass.h +++ b/AsyncDisplayKit/Layout/ASLayoutNodeSubclass.h @@ -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 diff --git a/AsyncDisplayKit/Layout/ASOverlayLayoutNode.mm b/AsyncDisplayKit/Layout/ASOverlayLayoutNode.mm index 57fb4b3210..72f6f4debf 100644 --- a/AsyncDisplayKit/Layout/ASOverlayLayoutNode.mm +++ b/AsyncDisplayKit/Layout/ASOverlayLayoutNode.mm @@ -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]]; } diff --git a/AsyncDisplayKit/Layout/ASRatioLayoutNode.mm b/AsyncDisplayKit/Layout/ASRatioLayoutNode.mm index 18b68aae23..2614efa05a 100644 --- a/AsyncDisplayKit/Layout/ASRatioLayoutNode.mm +++ b/AsyncDisplayKit/Layout/ASRatioLayoutNode.mm @@ -46,7 +46,7 @@ ASDISPLAYNODE_NOT_DESIGNATED_INITIALIZER(); } -- (ASLayout *)computeLayoutThatFits:(ASSizeRange)constrainedSize +- (ASLayout *)calculateLayoutThatFits:(ASSizeRange)constrainedSize { std::vector 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]]]; diff --git a/AsyncDisplayKit/Layout/ASStackLayoutNode.mm b/AsyncDisplayKit/Layout/ASStackLayoutNode.mm index 26879f4381..ae55c0af70 100644 --- a/AsyncDisplayKit/Layout/ASStackLayoutNode.mm +++ b/AsyncDisplayKit/Layout/ASStackLayoutNode.mm @@ -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); diff --git a/AsyncDisplayKit/Layout/ASStaticLayoutNode.mm b/AsyncDisplayKit/Layout/ASStaticLayoutNode.mm index aeaea5e4c8..e5ceff15d4 100644 --- a/AsyncDisplayKit/Layout/ASStaticLayoutNode.mm +++ b/AsyncDisplayKit/Layout/ASStaticLayoutNode.mm @@ -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]; } diff --git a/AsyncDisplayKit/Private/ASStackUnpositionedLayout.mm b/AsyncDisplayKit/Private/ASStackUnpositionedLayout.mm index db9d3def6d..189de696ac 100644 --- a/AsyncDisplayKit/Private/ASStackUnpositionedLayout.mm +++ b/AsyncDisplayKit/Private/ASStackUnpositionedLayout.mm @@ -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]; } /** diff --git a/AsyncDisplayKitTests/ASLayoutNodeSnapshotTestsHelper.m b/AsyncDisplayKitTests/ASLayoutNodeSnapshotTestsHelper.m index b0200175ba..c9c545220e 100644 --- a/AsyncDisplayKitTests/ASLayoutNodeSnapshotTestsHelper.m +++ b/AsyncDisplayKitTests/ASLayoutNodeSnapshotTestsHelper.m @@ -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]; }