mirror of
https://github.com/status-im/react-native.git
synced 2025-02-05 14:13:26 +00:00
Fix shrinking in non strech alignments
Summary: This fixes shrinking of elements which are in a non stretch alignment Fixes #633 Closes https://github.com/facebook/yoga/pull/634 Differential Revision: D5874862 Pulled By: emilsjolander fbshipit-source-id: 1426aa6b60f6ba42c2be702e6f24cea935ab7acb
This commit is contained in:
parent
565a24140b
commit
aa8eb806ca
@ -2308,6 +2308,7 @@ 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) {
|
||||
@ -2322,11 +2323,12 @@ 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 (!YGFloatIsUndefined(availableInnerMainDim)) {
|
||||
if (!sizeBasedOnContent && !YGFloatIsUndefined(availableInnerMainDim)) {
|
||||
remainingFreeSpace = availableInnerMainDim - sizeConsumedOnCurrentLine;
|
||||
} else if (sizeConsumedOnCurrentLine < 0) {
|
||||
// availableInnerMainDim is indefinite which means the node is being sized based on its
|
||||
|
Loading…
x
Reference in New Issue
Block a user