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

renamed to YGBaseline

Browse Source
This commit is contained in:
Lukas Woehrl
2017-01-05 14:47:21 +01:00
parent 23ad2df59c
commit 17ef313d09
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
yoga/Yoga.c
View File

@@ -950,7 +950,7 @@ static inline YGDirection YGNodeResolveDirection(const YGNodeRef node,
} }
} }
static float YGBaselineOfFirstLine(const YGNodeRef node, const YGFlexDirection crossAxis) { static float YGBaseline(const YGNodeRef node, const YGFlexDirection crossAxis) {
if (node->baseline != NULL) { if (node->baseline != NULL) {
const float baseline = node->baseline(node); const float baseline = node->baseline(node);
if (YGFloatIsUndefined(baseline)) { if (YGFloatIsUndefined(baseline)) {
@@ -979,7 +979,7 @@ static float YGBaselineOfFirstLine(const YGNodeRef node, const YGFlexDirection c
if (baselineChild == NULL) { if (baselineChild == NULL) {
return node->layout.measuredDimensions[dim[crossAxis]]; return node->layout.measuredDimensions[dim[crossAxis]];
} }
const float baseline = YGBaselineOfFirstLine(baselineChild, crossAxis); const float baseline = YGBaseline(baselineChild, crossAxis);
return baseline + baselineChild->layout.position[pos[crossAxis]]; return baseline + baselineChild->layout.position[pos[crossAxis]];
} }
@@ -2508,8 +2508,8 @@ static void YGNodelayoutImpl(const YGNodeRef node,
child->layout.measuredDimensions[dim[crossAxis]] + child->layout.measuredDimensions[dim[crossAxis]] +
YGNodeMarginForAxis(child, crossAxis, availableInnerWidth)); YGNodeMarginForAxis(child, crossAxis, availableInnerWidth));
} }
if (performLayout && YGNodeAlignItem(node, child) == YGAlignBaseline) { if (YGNodeAlignItem(node, child) == YGAlignBaseline) {
const float ascent = YGBaselineOfFirstLine(child, crossAxis) + const float ascent = YGBaseline(child, crossAxis) +
YGNodeLeadingMargin(child, crossAxis, availableInnerWidth); YGNodeLeadingMargin(child, crossAxis, availableInnerWidth);
const float descent = child->layout.measuredDimensions[dim[crossAxis]] + const float descent = child->layout.measuredDimensions[dim[crossAxis]] +
YGNodeMarginForAxis(child, crossAxis, availableInnerWidth) - YGNodeMarginForAxis(child, crossAxis, availableInnerWidth) -
@@ -2557,7 +2557,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
case YGAlignBaseline: { case YGAlignBaseline: {
child->layout.position[pos[crossAxis]] = child->layout.position[pos[crossAxis]] =
currentLead + maxAscentForCurrentLine - currentLead + maxAscentForCurrentLine -
YGBaselineOfFirstLine(child, crossAxis) + YGBaseline(child, crossAxis) +
YGNodeLeadingPosition(child, crossAxis, availableInnerCrossDim); YGNodeLeadingPosition(child, crossAxis, availableInnerCrossDim);
break; break;
} }