renamed variables correctly and used correct values

This commit is contained in:
Lukas Woehrl
2017-01-05 13:35:54 +01:00
parent 45f0011065
commit 3e5e01f6e1

View File

@@ -951,7 +951,7 @@ static inline YGDirection YGNodeResolveDirection(const YGNodeRef node,
} }
static float YGBaselineOfFirstLine(const YGNodeRef node, static float YGBaselineOfFirstLine(const YGNodeRef node,
const YGFlexDirection mainAxis, const YGFlexDirection crossAxis,
const float parentWidth) { const float parentWidth) {
if (node->baseline != NULL) { if (node->baseline != NULL) {
return node->baseline(node); return node->baseline(node);
@@ -982,8 +982,8 @@ static float YGBaselineOfFirstLine(const YGNodeRef node,
node->style.flexDirection, node->style.flexDirection,
node->layout.measuredDimensions[YGDimensionWidth]); node->layout.measuredDimensions[YGDimensionWidth]);
if (YGFloatIsUndefined(baseline)) { if (YGFloatIsUndefined(baseline)) {
baseline = YGNodeLeadingPaddingAndBorder(baselineChild, mainAxis, parentWidth) + baseline = YGNodeLeadingPaddingAndBorder(baselineChild, node->style.flexDirection, node->layout.measuredDimensions[YGDimensionWidth]) +
baselineChild->layout.measuredDimensions[dim[mainAxis]]; baselineChild->layout.measuredDimensions[dim[node->style.flexDirection]];
} }
return baseline + baselineChild->layout.position[YGEdgeTop]; return baseline + baselineChild->layout.position[YGEdgeTop];