Permalink
Browse files

Fix useLegacyStretchBehaviour flag by simplifying its usage

Reviewed By: gkassabli

Differential Revision: D4977923

fbshipit-source-id: cb488e63c7c2e15e4c0f0133a16df36580c646fd
  • Loading branch information...
emilsjolander authored and facebook-github-bot committed May 1, 2017
1 parent 99e24ec commit d199d1d65af224f6c4607864526439308ddd6568
Showing with 4 additions and 10 deletions.
  1. +4 −10 ReactCommon/yoga/yoga/Yoga.c
@@ -2199,7 +2199,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) {
@@ -2212,21 +2211,16 @@ static void YGNodelayoutImpl(const YGNodeRef node,
// space we've used is all space we need
availableInnerMainDim = sizeConsumedOnCurrentLine;
}
sizeBasedOnContent = true;
}
}
float remainingFreeSpace = 0;
if ((!sizeBasedOnContent || node->config->useLegacyStretchBehaviour) && !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
// content.
// sizeConsumedOnCurrentLine is negative which means the node will
// allocate 0 points for
// its content. Consequently, remainingFreeSpace is 0 -
// sizeConsumedOnCurrentLine.
// availableInnerMainDim is indefinite which means the node is being sized based on its content.
// sizeConsumedOnCurrentLine is negative which means the node will allocate 0 points for
// its content. Consequently, remainingFreeSpace is 0 - sizeConsumedOnCurrentLine.
remainingFreeSpace = -sizeConsumedOnCurrentLine;
}

0 comments on commit d199d1d

Please sign in to comment.