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 +4602 -7
20 changed files with 4602 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9e44f0f4d4 - Show all commits

5
yoga/Yoga.c
View File

@@ -1025,6 +1025,7 @@ static bool YGIsBaselineLayout(const YGNodeRef node) {
return true; return true;
} }
} }
return false; return false;
} }
@@ -2575,9 +2576,9 @@ static void YGNodelayoutImpl(const YGNodeRef node,
break; break;
} }
case YGAlignBaseline: { case YGAlignBaseline: {
child->layout.position[pos[crossAxis]] = child->layout.position[YGEdgeTop] =
currentLead + maxAscentForCurrentLine - YGBaseline(child) + currentLead + maxAscentForCurrentLine - YGBaseline(child) +
YGNodeLeadingPosition(child, crossAxis, availableInnerCrossDim); YGNodeLeadingPosition(child, YGFlexDirectionColumn, availableInnerCrossDim);
break; break;
} }
case YGAlignAuto: case YGAlignAuto:

1
yoga/Yoga.h
View File

@@ -50,7 +50,6 @@ typedef YGSize (*YGMeasureFunc)(YGNodeRef node,
float height, float height,
YGMeasureMode heightMode); YGMeasureMode heightMode);
typedef float (*YGBaselineFunc)(YGNodeRef node); typedef float (*YGBaselineFunc)(YGNodeRef node);
typedef void (*YGPrintFunc)(YGNodeRef node); typedef void (*YGPrintFunc)(YGNodeRef node);
typedef int (*YGLogger)(YGLogLevel level, const char *format, va_list args); typedef int (*YGLogger)(YGLogLevel level, const char *format, va_list args);