DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

Fix for failing screenshot tests

Browse Source 
Summary: Fixes failing screenshot tests

Reviewed By: emilsjolander

Differential Revision: D6726745

fbshipit-source-id: 99f91aabe2337b23953724545f97695238f2124e
This commit is contained in:
Pritesh Nandgaonkar
2018-01-16 08:57:11 -08:00
committed by Facebook Github Bot
parent b8c2428b31
commit 288adc49c9
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yoga/Yoga.cpp
View File

@@ -1553,9 +1553,6 @@ static void YGNodeComputeFlexBasisForChildren(
child->setDirty(false); child->setDirty(false);
continue; continue;
} }
if (child->getStyle().positionType == YGPositionTypeAbsolute) {
continue;
}
if (performLayout) { if (performLayout) {
// Set the initial position (relative to the parent). // Set the initial position (relative to the parent).
const YGDirection childDirection = child->resolveDirection(direction); const YGDirection childDirection = child->resolveDirection(direction);
@@ -1568,6 +1565,10 @@ static void YGNodeComputeFlexBasisForChildren(
child->setPosition( child->setPosition(
childDirection, mainDim, crossDim, availableInnerWidth); childDirection, mainDim, crossDim, availableInnerWidth);
} }
if (child->getStyle().positionType == YGPositionTypeAbsolute) {
continue;
}
if (child == singleFlexChild) { if (child == singleFlexChild) {
child->setLayoutComputedFlexBasisGeneration(gCurrentGenerationCount); child->setLayoutComputedFlexBasisGeneration(gCurrentGenerationCount);
child->setLayoutComputedFlexBasis(0); child->setLayoutComputedFlexBasis(0);