diff --git a/AsyncDisplayKit/Layout/ASDimension.mm b/AsyncDisplayKit/Layout/ASDimension.mm index 5859830c56..a60b6b4ba9 100644 --- a/AsyncDisplayKit/Layout/ASDimension.mm +++ b/AsyncDisplayKit/Layout/ASDimension.mm @@ -19,9 +19,9 @@ ASRelativeDimension ASRelativeDimensionMake(ASRelativeDimensionType type, CGFloa { if (type == ASRelativeDimensionTypePoints) { ASDisplayNodeCAssertPositiveReal(@"Points", value); - } else if (type == ASRelativeDimensionTypePercent) { + } else if (type == ASRelativeDimensionTypeFraction) { // TODO: Enable this assertion for 2.0. Check that there is no use case for using a larger value, e.g. to layout for a clipsToBounds = NO element. - // ASDisplayNodeCAssert( 0 <= value && value <= 1.0, @"ASRelativeDimension percent value (%f) must be between 0 and 1.", value); + // ASDisplayNodeCAssert( 0 <= value && value <= 1.0, @"ASRelativeDimension fraction value (%f) must be between 0 and 1.", value); } ASRelativeDimension dimension; dimension.type = type; dimension.value = value; return dimension; } diff --git a/AsyncDisplayKit/Layout/ASRelativeSize.h b/AsyncDisplayKit/Layout/ASRelativeSize.h index 12f4845531..4f355044e9 100644 --- a/AsyncDisplayKit/Layout/ASRelativeSize.h +++ b/AsyncDisplayKit/Layout/ASRelativeSize.h @@ -39,11 +39,11 @@ NS_ASSUME_NONNULL_BEGIN extern ASRelativeSize ASRelativeSizeMake(ASRelativeDimension width, ASRelativeDimension height); -/** Convenience constructor to provide size in Points. */ +/** Convenience constructor to provide size in points. */ extern ASRelativeSize ASRelativeSizeMakeWithCGSize(CGSize size); -/** Convenience constructor to provide size in Percentage. */ -extern ASRelativeSize ASRelativeSizeMakeWithPercent(CGFloat percent); +/** Convenience constructor to provide size as a fraction. */ +extern ASRelativeSize ASRelativeSizeMakeWithFraction(CGFloat fraction); /** Resolve this relative size relative to a parent size. */ extern CGSize ASRelativeSizeResolveSize(ASRelativeSize relativeSize, CGSize parentSize); @@ -61,7 +61,7 @@ extern ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactRelativeSize(ASRelati extern ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactCGSize(CGSize exact); -extern ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactPercent(CGFloat percent); +extern ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactFraction(CGFloat fraction); extern ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactRelativeDimensions(ASRelativeDimension exactWidth, ASRelativeDimension exactHeight); diff --git a/AsyncDisplayKit/Layout/ASRelativeSize.mm b/AsyncDisplayKit/Layout/ASRelativeSize.mm index 575c1f197e..3fc7abd92d 100644 --- a/AsyncDisplayKit/Layout/ASRelativeSize.mm +++ b/AsyncDisplayKit/Layout/ASRelativeSize.mm @@ -25,10 +25,10 @@ ASRelativeSize ASRelativeSizeMakeWithCGSize(CGSize size) ASRelativeDimensionMakeWithPoints(size.height)); } -ASRelativeSize ASRelativeSizeMakeWithPercent(CGFloat percent) +ASRelativeSize ASRelativeSizeMakeWithFraction(CGFloat fraction) { - return ASRelativeSizeMake(ASRelativeDimensionMakeWithPercent(percent), - ASRelativeDimensionMakeWithPercent(percent)); + return ASRelativeSizeMake(ASRelativeDimensionMakeWithFraction(fraction), + ASRelativeDimensionMakeWithFraction(fraction)); } CGSize ASRelativeSizeResolveSize(ASRelativeSize relativeSize, CGSize parentSize) @@ -67,9 +67,9 @@ ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactCGSize(CGSize exact) return ASRelativeSizeRangeMakeWithExactRelativeSize(ASRelativeSizeMakeWithCGSize(exact)); } -ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactPercent(CGFloat percent) +ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactFraction(CGFloat fraction) { - return ASRelativeSizeRangeMakeWithExactRelativeSize(ASRelativeSizeMakeWithPercent(percent)); + return ASRelativeSizeRangeMakeWithExactRelativeSize(ASRelativeSizeMakeWithFraction(fraction)); } ASRelativeSizeRange ASRelativeSizeRangeMakeWithExactRelativeDimensions(ASRelativeDimension exactWidth,