From 167b7d404ebc73c3e7d013722d93e79d521e951b Mon Sep 17 00:00:00 2001 From: Levi McCallum Date: Wed, 9 Mar 2016 10:38:25 -0800 Subject: [PATCH 1/4] Add header for extern ASSizeRangeMakeWithExactCGSize --- AsyncDisplayKit/Layout/ASDimension.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/AsyncDisplayKit/Layout/ASDimension.h b/AsyncDisplayKit/Layout/ASDimension.h index c96b2155ae..d9444780a1 100644 --- a/AsyncDisplayKit/Layout/ASDimension.h +++ b/AsyncDisplayKit/Layout/ASDimension.h @@ -58,6 +58,9 @@ extern CGFloat ASRelativeDimensionResolve(ASRelativeDimension dimension, CGFloat extern ASSizeRange ASSizeRangeMake(CGSize min, CGSize max); +/** Creates an ASSizeRange with the provided size as both min and max */ +extern ASSizeRange ASSizeRangeMakeWithExactCGSize(CGSize size); + /** Clamps the provided CGSize between the [min, max] bounds of this ASSizeRange. */ extern CGSize ASSizeRangeClamp(ASSizeRange sizeRange, CGSize size); From d4a0c34d86feb6c279763072fb47da17971bb688 Mon Sep 17 00:00:00 2001 From: Levi McCallum Date: Wed, 9 Mar 2016 10:39:46 -0800 Subject: [PATCH 2/4] Add ASSizeRangeMakeWithExactCGSize method --- AsyncDisplayKit/Layout/ASDimension.mm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/AsyncDisplayKit/Layout/ASDimension.mm b/AsyncDisplayKit/Layout/ASDimension.mm index a1e42c4b76..cd7199a5e9 100644 --- a/AsyncDisplayKit/Layout/ASDimension.mm +++ b/AsyncDisplayKit/Layout/ASDimension.mm @@ -77,6 +77,11 @@ ASSizeRange ASSizeRangeMake(CGSize min, CGSize max) ASSizeRange sizeRange; sizeRange.min = min; sizeRange.max = max; return sizeRange; } +ASSizeRange ASSizeRangeMakeWithExactCGSize(CGSize size) +{ + return ASSizeRangeMake(size, size); +} + CGSize ASSizeRangeClamp(ASSizeRange sizeRange, CGSize size) { return CGSizeMake(MAX(sizeRange.min.width, MIN(sizeRange.max.width, size.width)), From a07f7b73f084a35fa6151873dd574a73287a6671 Mon Sep 17 00:00:00 2001 From: Levi McCallum Date: Wed, 9 Mar 2016 10:42:35 -0800 Subject: [PATCH 3/4] Change method name in header --- AsyncDisplayKit/Layout/ASDimension.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/Layout/ASDimension.h b/AsyncDisplayKit/Layout/ASDimension.h index d9444780a1..3dba264468 100644 --- a/AsyncDisplayKit/Layout/ASDimension.h +++ b/AsyncDisplayKit/Layout/ASDimension.h @@ -59,7 +59,7 @@ extern CGFloat ASRelativeDimensionResolve(ASRelativeDimension dimension, CGFloat extern ASSizeRange ASSizeRangeMake(CGSize min, CGSize max); /** Creates an ASSizeRange with the provided size as both min and max */ -extern ASSizeRange ASSizeRangeMakeWithExactCGSize(CGSize size); +extern ASSizeRange ASSizeRangeMakeExactSize(CGSize size); /** Clamps the provided CGSize between the [min, max] bounds of this ASSizeRange. */ extern CGSize ASSizeRangeClamp(ASSizeRange sizeRange, CGSize size); From 52391dcc278946423d85f7fddee4417a6017df47 Mon Sep 17 00:00:00 2001 From: Levi McCallum Date: Wed, 9 Mar 2016 10:42:56 -0800 Subject: [PATCH 4/4] Change method name in implementation --- AsyncDisplayKit/Layout/ASDimension.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AsyncDisplayKit/Layout/ASDimension.mm b/AsyncDisplayKit/Layout/ASDimension.mm index cd7199a5e9..7715e3b07a 100644 --- a/AsyncDisplayKit/Layout/ASDimension.mm +++ b/AsyncDisplayKit/Layout/ASDimension.mm @@ -77,7 +77,7 @@ ASSizeRange ASSizeRangeMake(CGSize min, CGSize max) ASSizeRange sizeRange; sizeRange.min = min; sizeRange.max = max; return sizeRange; } -ASSizeRange ASSizeRangeMakeWithExactCGSize(CGSize size) +ASSizeRange ASSizeRangeMakeExactSize(CGSize size) { return ASSizeRangeMake(size, size); }