ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-13 09:50:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1349 from levi/patch-8

Browse Source 
[ASDimension / ASSizeRange] Add ASSizeRangeMakeExactSize method
This commit is contained in:
appleguy 2016-03-11 21:21:09 -08:00
commit a4e3ba49b4
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AsyncDisplayKit/Layout/ASDimension.h
View File

@ -59,6 +59,9 @@ extern CGFloat ASRelativeDimensionResolve(ASRelativeDimension dimension, CGFloat
extern ASSizeRange ASSizeRangeMake(CGSize min, CGSize max); extern ASSizeRange ASSizeRangeMake(CGSize min, CGSize max);
/** Creates an ASSizeRange with the provided size as both min and max */
extern ASSizeRange ASSizeRangeMakeExactSize(CGSize size);
/** Clamps the provided CGSize between the [min, max] bounds of this ASSizeRange. */ /** Clamps the provided CGSize between the [min, max] bounds of this ASSizeRange. */
extern CGSize ASSizeRangeClamp(ASSizeRange sizeRange, CGSize size); extern CGSize ASSizeRangeClamp(ASSizeRange sizeRange, CGSize size);

5
AsyncDisplayKit/Layout/ASDimension.mm
View File

@ -77,6 +77,11 @@ ASSizeRange ASSizeRangeMake(CGSize min, CGSize max)
ASSizeRange sizeRange; sizeRange.min = min; sizeRange.max = max; return sizeRange; ASSizeRange sizeRange; sizeRange.min = min; sizeRange.max = max; return sizeRange;
} }
ASSizeRange ASSizeRangeMakeExactSize(CGSize size)
{
return ASSizeRangeMake(size, size);
}
CGSize ASSizeRangeClamp(ASSizeRange sizeRange, CGSize size) CGSize ASSizeRangeClamp(ASSizeRange sizeRange, CGSize size)
{ {
return CGSizeMake(MAX(sizeRange.min.width, MIN(sizeRange.max.width, size.width)), return CGSizeMake(MAX(sizeRange.min.width, MIN(sizeRange.max.width, size.width)),