From 49c21abdc5e0f369d58343e05fcf6aaa424cd086 Mon Sep 17 00:00:00 2001 From: Tim Norman Date: Mon, 19 Nov 2018 13:10:04 -0800 Subject: [PATCH 1/2] Convert YGUndefined back to CGFLOAT_MAX for Texture layout --- Source/Layout/ASYogaUtilities.mm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Source/Layout/ASYogaUtilities.mm b/Source/Layout/ASYogaUtilities.mm index fa6e13592..fcdcc46ed 100644 --- a/Source/Layout/ASYogaUtilities.mm +++ b/Source/Layout/ASYogaUtilities.mm @@ -106,6 +106,10 @@ float yogaFloatForCGFloat(CGFloat value) } } +float cgFloatForYogaFloat(float yogaFloat) { + return (yogaFloat == YGUndefined) ? CGFLOAT_MAX : yogaFloat; +} + float yogaDimensionToPoints(ASDimension dimension) { ASDisplayNodeCAssert(dimension.unit == ASDimensionUnitPoints, @@ -197,6 +201,9 @@ YGSize ASLayoutElementYogaMeasureFunc(YGNodeRef yogaNode, float width, YGMeasure id layoutElement = (__bridge id )YGNodeGetContext(yogaNode); ASDisplayNodeCAssert([layoutElement conformsToProtocol:@protocol(ASLayoutElement)], @"Yoga context must be "); + width = cgFloatForYogaFloat(width); + height = cgFloatForYogaFloat(height); + ASSizeRange sizeRange; sizeRange.min = CGSizeZero; sizeRange.max = CGSizeMake(width, height); From 6452535eb1b120feabc85c30e4f6f1f855603db5 Mon Sep 17 00:00:00 2001 From: appleguy Date: Mon, 19 Nov 2018 17:53:26 -0800 Subject: [PATCH 2/2] Update ASYogaUtilities.mm Quick fix to brace style --- Source/Layout/ASYogaUtilities.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Layout/ASYogaUtilities.mm b/Source/Layout/ASYogaUtilities.mm index fcdcc46ed..161a5baef 100644 --- a/Source/Layout/ASYogaUtilities.mm +++ b/Source/Layout/ASYogaUtilities.mm @@ -106,7 +106,8 @@ float yogaFloatForCGFloat(CGFloat value) } } -float cgFloatForYogaFloat(float yogaFloat) { +float cgFloatForYogaFloat(float yogaFloat) +{ return (yogaFloat == YGUndefined) ? CGFLOAT_MAX : yogaFloat; }