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

fix layout with explicit top specified

Browse Source
This commit is contained in:
Lukas Woehrl
2017-01-05 14:29:26 +01:00
parent 00ab30e337
commit 23ad2df59c
5 changed files with 444 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
yoga/Yoga.c
View File

@@ -979,9 +979,8 @@ static float YGBaselineOfFirstLine(const YGNodeRef node, const YGFlexDirection c
if (baselineChild == NULL) {
return node->layout.measuredDimensions[dim[crossAxis]];
}
const float baseline = YGBaselineOfFirstLine(baselineChild, crossAxis);
return baseline + baselineChild->layout.position[YGEdgeTop];
return baseline + baselineChild->layout.position[pos[crossAxis]];
}
static inline YGFlexDirection YGFlexDirectionResolve(const YGFlexDirection flexDirection,
@@ -2557,7 +2556,9 @@ static void YGNodelayoutImpl(const YGNodeRef node,
}
case YGAlignBaseline: {
child->layout.position[pos[crossAxis]] =
currentLead + maxAscentForCurrentLine - YGBaselineOfFirstLine(child, crossAxis);
currentLead + maxAscentForCurrentLine -
YGBaselineOfFirstLine(child, crossAxis) +
YGNodeLeadingPosition(child, crossAxis, availableInnerCrossDim);
break;
}
case YGAlignAuto: