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

remove unneeded function

Browse Source
This commit is contained in:
Lukas Woehrl
2017-01-05 13:50:53 +01:00
parent 49ffda5431
commit d4e45958d0
2 changed files with 3078 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
yoga/Yoga.c
View File

@@ -950,11 +950,13 @@ static inline YGDirection YGNodeResolveDirection(const YGNodeRef node,
}
}
static float YGBaselineForNode(const YGNodeRef node, const YGFlexDirection crossAxis);
static float YGBaselineOfFirstLine(const YGNodeRef node) {
static float YGBaselineOfFirstLine(const YGNodeRef node, const YGFlexDirection crossAxis) {
if (node->baseline != NULL) {
return node->baseline(node);
const float baseline = node->baseline(node);
if (YGFloatIsUndefined(baseline)) {
return node->layout.measuredDimensions[dim[crossAxis]];
}
return baseline;
}
YGNodeRef baselineChild = NULL;
@@ -975,19 +977,11 @@ static float YGBaselineOfFirstLine(const YGNodeRef node) {
}
if (baselineChild == NULL) {
return YGUndefined;
}
const float baseline = YGBaselineForNode(baselineChild, node->style.flexDirection);
return baseline + baselineChild->layout.position[YGEdgeTop];
}
static inline float YGBaselineForNode(const YGNodeRef node, const YGFlexDirection crossAxis) {
float baseline = YGBaselineOfFirstLine(node);
if (YGFloatIsUndefined(baseline)) {
return node->layout.measuredDimensions[dim[crossAxis]];
}
return baseline;
const float baseline = YGBaselineOfFirstLine(baselineChild, node->style.flexDirection);
return baseline + baselineChild->layout.position[YGEdgeTop];
}
static inline YGFlexDirection YGFlexDirectionResolve(const YGFlexDirection flexDirection,
@@ -2516,7 +2510,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
YGNodeMarginForAxis(child, crossAxis, availableInnerWidth));
}
if (performLayout && YGNodeAlignItem(node, child) == YGAlignBaseline) {
const float ascent = YGBaselineForNode(child, crossAxis) +
const float ascent = YGBaselineOfFirstLine(child, crossAxis) +
YGNodeLeadingMargin(child, crossAxis, availableInnerWidth);
const float descent = child->layout.measuredDimensions[dim[crossAxis]] +
YGNodeMarginForAxis(child, crossAxis, availableInnerWidth) -
@@ -2563,7 +2557,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
}
case YGAlignBaseline: {
child->layout.position[pos[crossAxis]] =
currentLead + maxAscentForCurrentLine - YGBaselineForNode(child, crossAxis);
currentLead + maxAscentForCurrentLine - YGBaselineOfFirstLine(child, crossAxis);
break;
}
case YGAlignAuto: