From 244045edea797ad120d7d10869faf1e4ab0320ae Mon Sep 17 00:00:00 2001 From: Emil Sjolander Date: Thu, 21 Sep 2017 03:36:02 -0700 Subject: [PATCH] Revert D5874862: [yoga][PR] Fix shrinking in non strech alignments Differential Revision: D5874862 fbshipit-source-id: 24517d26b18c11fb9f75c6d3b5faae360711ea9e --- ReactCommon/yoga/yoga/Yoga.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ReactCommon/yoga/yoga/Yoga.c b/ReactCommon/yoga/yoga/Yoga.c index 26489faacef..84aa5a75724 100644 --- a/ReactCommon/yoga/yoga/Yoga.c +++ b/ReactCommon/yoga/yoga/Yoga.c @@ -2308,7 +2308,6 @@ static void YGNodelayoutImpl(const YGNodeRef node, // If the main dimension size isn't known, it is computed based on // the line length, so there's no more space left to distribute. - bool sizeBasedOnContent = false; // If we don't measure with exact main dimension we want to ensure we don't violate min and max if (measureModeMainDim != YGMeasureModeExactly) { if (!YGFloatIsUndefined(minInnerMainDim) && sizeConsumedOnCurrentLine < minInnerMainDim) { @@ -2323,12 +2322,11 @@ static void YGNodelayoutImpl(const YGNodeRef node, // space we've used is all space we need. Root node also should be shrunk to minimum availableInnerMainDim = sizeConsumedOnCurrentLine; } - sizeBasedOnContent = true; } } float remainingFreeSpace = 0; - if (!sizeBasedOnContent && !YGFloatIsUndefined(availableInnerMainDim)) { + if (!YGFloatIsUndefined(availableInnerMainDim)) { remainingFreeSpace = availableInnerMainDim - sizeConsumedOnCurrentLine; } else if (sizeConsumedOnCurrentLine < 0) { // availableInnerMainDim is indefinite which means the node is being sized based on its