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 b790bf7dba - Show all commits

4
yoga/Yoga.c
View File

@@ -958,9 +958,7 @@ static inline YGDirection YGNodeResolveDirection(const YGNodeRef node,
static float YGBaseline(const YGNodeRef node) { static float YGBaseline(const YGNodeRef node) {
if (node->baseline != NULL) { if (node->baseline != NULL) {
const float baseline = node->baseline(node); const float baseline = node->baseline(node);
if (YGFloatIsUndefined(baseline)) { YG_ASSERT(!YGFloatIsUndefined(baseline), "Expect custom baseline function to not return NaN")
return node->layout.measuredDimensions[YGDimensionHeight];
}
return baseline; return baseline;
} }