kylefang/AsyncDisplayKit
1
0
Fork 0
mirror of https://github.com/HackPlan/AsyncDisplayKit.git synced 2026-04-24 03:45:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix ASDimension creation of type ASDimensionUnitFraction via a NSString (#2347)

Browse Source
This commit is contained in:
Michael Schneider
2016-10-05 18:30:24 -07:00
committed by appleguy
parent 27cccc74ae
commit 271ab20de5
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AsyncDisplayKit/Layout/ASDimension.mm
View File

@@ -38,7 +38,7 @@ ASOVERLOADABLE ASDimension ASDimensionMake(NSString *dimension)
// Check if percent is at the end and remove it
if (percentStringLocation == (dimension.length-1)) {
dimension = [dimension substringToIndex:(dimension.length-1)];
return ASDimensionMake(ASDimensionUnitFraction, dimension.floatValue);
return ASDimensionMake(ASDimensionUnitFraction, (dimension.floatValue / 100.0));
}
}

8
AsyncDisplayKitTests/ASDimensionTests.mm
View File

@@ -22,12 +22,20 @@
{
XCTAssertNoThrow(ASDimensionMake(ASDimensionUnitAuto, 0));
XCTAssertThrows(ASDimensionMake(ASDimensionUnitAuto, 100));
XCTAssertTrue(ASDimensionEqualToDimension(ASDimensionMake(ASDimensionUnitFraction, 0.5), ASDimensionMake(@"50%")));
}
- (void)testCreatingDimensionUnitFraction
{
XCTAssertNoThrow(ASDimensionMake(ASDimensionUnitFraction, 0.5));
XCTAssertThrows(ASDimensionMake(ASDimensionUnitAuto, 100));
XCTAssertTrue(ASDimensionEqualToDimension(ASDimensionMake(ASDimensionUnitFraction, 0.5), ASDimensionMake(@"50%")));
}
- (void)testCreatingDimensionUnitPoints
{
XCTAssertNoThrow(ASDimensionMake(ASDimensionUnitPoints, 100));
XCTAssertTrue(ASDimensionEqualToDimension(ASDimensionMake(ASDimensionUnitPoints, 100), ASDimensionMake(@"100pt")));
}
- (void)testIntersectingOverlappingSizeRangesReturnsTheirIntersection