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

Baseline support #317

Closed
woehrl01 wants to merge 33 commits from baseline-support into master
pull from: baseline-support
merge into: DaddyFrosty:master
Conversation 39 Commits 33 Files Changed 20 +1020 -2
14 changed files with 1020 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 09f347092b - Show all commits

8
yoga/Yoga.c
View File

@@ -2554,7 +2554,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
if (child->style.positionType == YGPositionTypeRelative) {
switch (YGNodeAlignItem(node, child)) {
case YGAlignFlexStart: {
case YGAlignFlexStart: {
child->layout.position[pos[crossAxis]] =
currentLead + YGNodeLeadingMargin(child, crossAxis, availableInnerWidth);
break;
@@ -2580,9 +2580,9 @@ static void YGNodelayoutImpl(const YGNodeRef node,
break;
}
case YGAlignBaseline: {
child->layout.position[pos[crossAxis]] = currentLead
+ maxAscentForCurrentLine -
YGBaselineWithMargin(child, crossAxis, availableInnerWidth);;
child->layout.position[pos[crossAxis]] =
currentLead + maxAscentForCurrentLine -
YGBaselineWithMargin(child, crossAxis, availableInnerWidth);;
break;
}
case YGAlignAuto: