File tree Expand file tree Collapse file tree 1 file changed +7
-3
lines changed
Expand file tree Collapse file tree 1 file changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -2045,7 +2045,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
20452045 }
20462046
20472047 const bool flexBasisOverflows =
2048- measureModeMainDim == YGMeasureModeUndefined ? false : totalFlexBasis > availableInnerMainDim ;
2048+ measureModeMainDim == YGMeasureModeUndefined ? false : totalFlexBasis > availableInnerMainDim ;
20492049 if (isNodeFlexWrap && flexBasisOverflows && measureModeMainDim == YGMeasureModeAtMost ) {
20502050 measureModeMainDim = YGMeasureModeExactly ;
20512051 }
@@ -2338,8 +2338,12 @@ static void YGNodelayoutImpl(const YGNodeRef node,
23382338 childCrossSize = YGValueResolve (currentRelativeChild -> resolvedDimensions [dim [crossAxis ]],
23392339 availableInnerCrossDim ) +
23402340 marginCross ;
2341- childCrossMeasureMode =
2342- YGFloatIsUndefined (childCrossSize ) ? YGMeasureModeUndefined : YGMeasureModeExactly ;
2341+ const bool isLoosePercentageMeasurement =
2342+ currentRelativeChild -> resolvedDimensions [dim [crossAxis ]]-> unit == YGUnitPercent &&
2343+ measureModeCrossDim != YGMeasureModeExactly ;
2344+ childCrossMeasureMode = YGFloatIsUndefined (childCrossSize ) || isLoosePercentageMeasurement
2345+ ? YGMeasureModeUndefined
2346+ : YGMeasureModeExactly ;
23432347 }
23442348
23452349 if (!YGFloatIsUndefined (currentRelativeChild -> style .aspectRatio )) {
You can’t perform that action at this time.
0 commit comments