Back out "[yoga][PR] Fix aspect ratio when stretching with main axis margin"
Summary: Original commit changeset: 6970e6072e79 Reviewed By: mdvacca Differential Revision: D13437552 fbshipit-source-id: 65a55d716da6b6582e38efa906d3f540e58418bf
This commit is contained in:
parent
4ed3344275
commit
1decf879f8
|
@ -1382,16 +1382,6 @@ static void YGNodeComputeFlexBasisForChild(
|
|||
auto marginColumn = YGUnwrapFloatOptional(
|
||||
child->getMarginForAxis(YGFlexDirectionColumn, ownerWidth));
|
||||
|
||||
if (YGNodeAlignItem(node, child) == YGAlignStretch) {
|
||||
if (isMainAxisRow && !YGFloatIsUndefined(height)) {
|
||||
childHeight = height;
|
||||
childHeightMeasureMode = YGMeasureModeExactly;
|
||||
} else if (!isMainAxisRow && !YGFloatIsUndefined(width)) {
|
||||
childWidth = width;
|
||||
childWidthMeasureMode = YGMeasureModeExactly;
|
||||
}
|
||||
}
|
||||
|
||||
if (isRowStyleDimDefined) {
|
||||
childWidth =
|
||||
YGUnwrapFloatOptional(YGResolveValue(
|
||||
|
|
Loading…
Reference in New Issue