Permalink
Browse files

call margin method on child instead of node

Reviewed By: emilsjolander

Differential Revision: D6918367

fbshipit-source-id: cee90e015f9e45a717a7307f59fd3b9ef6f399b6
  • Loading branch information...
priteshrnandgaonkar authored and facebook-github-bot committed Feb 8, 2018
1 parent 09b43e4 commit f75e21f1caf9117ae3eda31c23e286116ebf586c
Showing with 4 additions and 5 deletions.
  1. +4 −5 ReactCommon/yoga/yoga/Yoga.cpp
@@ -1037,9 +1037,9 @@ static void YGNodeComputeFlexBasisForChild(const YGNodeRef node,
childHeightMeasureMode = YGMeasureModeUndefined;
const float marginRow =
node->getMarginForAxis(YGFlexDirectionRow, parentWidth);
child->getMarginForAxis(YGFlexDirectionRow, parentWidth);
const float marginColumn =
node->getMarginForAxis(YGFlexDirectionColumn, parentWidth);
child->getMarginForAxis(YGFlexDirectionColumn, parentWidth);
if (isRowStyleDimDefined) {
childWidth =
@@ -2624,9 +2624,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
}
if (child->getStyle().positionType == YGPositionTypeAbsolute) {
// If the child is absolutely positioned and has a
// top/left/bottom/right
// set, override all the previously computed positions to set it
// correctly.
// top/left/bottom/right set, override
// all the previously computed positions to set it correctly.
const bool isChildLeadingPosDefined =
child->isLeadingPositionDefined(crossAxis);
if (isChildLeadingPosDefined) {

0 comments on commit f75e21f

Please sign in to comment.