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

wrong comparions

Browse Source
This commit is contained in:
Lukas Woehrl
2017-01-05 18:21:06 +01:00
parent 9d035cd16a
commit 1c52ff1b4f
1 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
yoga/Yoga.c
View File

@@ -940,9 +940,7 @@ static inline float YGNodePaddingAndBorderForAxis(const YGNodeRef node,
static inline YGAlign YGNodeAlignItem(const YGNodeRef node, const YGNodeRef child) { static inline YGAlign YGNodeAlignItem(const YGNodeRef node, const YGNodeRef child) {
YGAlign align = YGAlign align =
child->style.alignSelf == YGAlignAuto ? node->style.alignItems : child->style.alignSelf; child->style.alignSelf == YGAlignAuto ? node->style.alignItems : child->style.alignSelf;
if (align == YGAlignBaseline && if (align == YGAlignBaseline && YGFlexDirectionIsColumn(node->style.flexDirection)) {
YGFlexDirectionIsRow(node->style.flexDirection) ==
YGFlexDirectionIsRow(child->style.flexDirection)) {
return YGAlignFlexStart; return YGAlignFlexStart;
} }
return align; return align;
@@ -989,17 +987,7 @@ static float YGBaseline(const YGNodeRef node,
return node->layout.measuredDimensions[dim[crossAxis]]; return node->layout.measuredDimensions[dim[crossAxis]];
} }
float baseline = YGUndefined; const float baseline = YGBaseline(baselineChild, crossAxis, mainAxis);
if (YGFlexDirectionIsRow(node->style.flexDirection) &&
YGFlexDirectionIsColumn(baselineChild->style.flexDirection)) {
baseline = baselineChild->layout.measuredDimensions[dim[crossAxis]];
} else if (YGFlexDirectionIsColumn(node->style.flexDirection) &&
YGFlexDirectionIsRow(baselineChild->style.flexDirection)) {
baseline = baselineChild->layout.measuredDimensions[dim[mainAxis]];
} else {
baseline = YGBaseline(baselineChild, crossAxis, mainAxis);
}
return baseline + baselineChild->layout.position[pos[crossAxis]]; return baseline + baselineChild->layout.position[pos[crossAxis]];
} }