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

fix whitespace indent

Browse Source
This commit is contained in:
Lukas Woehrl
2017-01-04 22:32:05 +01:00
parent 3b20c24fa3
commit 71a23ef987
1 changed files with 59 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
yoga/Yoga.c
View File

@@ -337,16 +337,16 @@ YGMeasureFunc YGNodeGetMeasureFunc(const YGNodeRef node) {
void YGNodeSetBaselineFunc(const YGNodeRef node, YGBaselineFunc baselineFunc) { void YGNodeSetBaselineFunc(const YGNodeRef node, YGBaselineFunc baselineFunc) {
if (baselineFunc == NULL) { if (baselineFunc == NULL) {
node->baseline = NULL; node->baseline = NULL;
} }
else { else {
node->baseline = baselineFunc; node->baseline = baselineFunc;
} }
} }
YGBaselineFunc YGNodeGetBaselineFunc(const YGNodeRef node) { YGBaselineFunc YGNodeGetBaselineFunc(const YGNodeRef node) {
return node->baseline; return node->baseline;
} }
void YGNodeInsertChild(const YGNodeRef node, const YGNodeRef child, const uint32_t index) { void YGNodeInsertChild(const YGNodeRef node, const YGNodeRef child, const uint32_t index) {
@@ -959,55 +959,55 @@ static inline YGDirection YGNodeResolveDirection(const YGNodeRef node,
static float YGBaselineOfFirstLine(const YGNodeRef node, const YGFlexDirection mainAxis, const float parentWidth) static float YGBaselineOfFirstLine(const YGNodeRef node, const YGFlexDirection mainAxis, const float parentWidth)
{ {
if(node->baseline != NULL) if(node->baseline != NULL)
{ {
return node->baseline(node); return node->baseline(node);
} }
YGNodeRef baselineChild = NULL; YGNodeRef baselineChild = NULL;
for(unsigned int i = 0; i < YGNodeGetChildCount(node); ++i) for(unsigned int i = 0; i < YGNodeGetChildCount(node); ++i)
{ {
const YGNodeRef child = YGNodeGetChild(node, i); const YGNodeRef child = YGNodeGetChild(node, i);
if(child->style.positionType == YGPositionTypeAbsolute || child->lineIndex > 0) if(child->style.positionType == YGPositionTypeAbsolute || child->lineIndex > 0)
{ {
continue; continue;
} }
if(YGNodeAlignItem(node, child) == YGAlignBaseline) if(YGNodeAlignItem(node, child) == YGAlignBaseline)
{ {
baselineChild = child; baselineChild = child;
break; break;
} }
if(baselineChild == NULL) if(baselineChild == NULL)
{ {
baselineChild = child; baselineChild = child;
} }
} }
if(baselineChild == NULL) if(baselineChild == NULL)
{ {
return YGUndefined; return YGUndefined;
} }
float baseline = YGBaselineOfFirstLine(baselineChild, node->style.direction, node->layout.measuredDimensions[YGDimensionWidth]); float baseline = YGBaselineOfFirstLine(baselineChild, node->style.direction, node->layout.measuredDimensions[YGDimensionWidth]);
if(YGFloatIsUndefined(baseline)) if(YGFloatIsUndefined(baseline))
{ {
baseline = YGNodeLeadingPaddingAndBorder(baselineChild, mainAxis, parentWidth) baseline = YGNodeLeadingPaddingAndBorder(baselineChild, mainAxis, parentWidth)
+ baselineChild->layout.measuredDimensions[dim[mainAxis]]; + baselineChild->layout.measuredDimensions[dim[mainAxis]];
} }
return baseline + baselineChild->layout.position[YGEdgeTop]; return baseline + baselineChild->layout.position[YGEdgeTop];
} }
static float YGBaselineWithMargin(const YGNodeRef node, const YGFlexDirection mainAxis, const float parentWidth) static float YGBaselineWithMargin(const YGNodeRef node, const YGFlexDirection mainAxis, const float parentWidth)
{ {
float baseline = YGBaselineOfFirstLine(node, mainAxis, parentWidth); float baseline = YGBaselineOfFirstLine(node, mainAxis, parentWidth);
if(YGFloatIsUndefined(baseline)) if(YGFloatIsUndefined(baseline))
{ {
baseline = node->layout.measuredDimensions[dim[mainAxis]]; baseline = node->layout.measuredDimensions[dim[mainAxis]];
} }
return baseline + YGNodeLeadingMargin(node, mainAxis, parentWidth); return baseline + YGNodeLeadingMargin(node, mainAxis, parentWidth);
} }
@@ -2512,7 +2512,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
break; break;
case YGAlignAuto: case YGAlignAuto:
case YGAlignFlexStart: case YGAlignFlexStart:
case YGAlignBaseline: case YGAlignBaseline:
break; break;
} }
@@ -2523,7 +2523,7 @@ static void YGNodelayoutImpl(const YGNodeRef node,
// compute the line's height and find the endIndex // compute the line's height and find the endIndex
float lineHeight = 0; float lineHeight = 0;
float maxAscentForCurrentLine = 0; float maxAscentForCurrentLine = 0;
for (ii = startIndex; ii < childCount; ii++) { for (ii = startIndex; ii < childCount; ii++) {
const YGNodeRef child = YGNodeListGet(node->children, ii); const YGNodeRef child = YGNodeListGet(node->children, ii);
@@ -2532,11 +2532,11 @@ static void YGNodelayoutImpl(const YGNodeRef node,
break; break;
} }
if (performLayout && YGNodeAlignItem(node, child) == YGAlignBaseline) if (performLayout && YGNodeAlignItem(node, child) == YGAlignBaseline)
{ {
maxAscentForCurrentLine = fmaxf(maxAscentForCurrentLine, maxAscentForCurrentLine = fmaxf(maxAscentForCurrentLine,
YGBaselineWithMargin(child, crossAxis, availableInnerWidth)); YGBaselineWithMargin(child, crossAxis, availableInnerWidth));
} }
if (YGNodeIsLayoutDimDefined(child, crossAxis)) { if (YGNodeIsLayoutDimDefined(child, crossAxis)) {
lineHeight = fmaxf(lineHeight, lineHeight = fmaxf(lineHeight,
@@ -2579,12 +2579,12 @@ static void YGNodelayoutImpl(const YGNodeRef node,
// (auto) crossAxis dimension. // (auto) crossAxis dimension.
break; break;
} }
case YGAlignBaseline: { case YGAlignBaseline: {
child->layout.position[pos[crossAxis]] = currentLead child->layout.position[pos[crossAxis]] = currentLead
+ maxAscentForCurrentLine - + maxAscentForCurrentLine -
YGBaselineWithMargin(child, crossAxis, availableInnerWidth);; YGBaselineWithMargin(child, crossAxis, availableInnerWidth);;
break; break;
} }
case YGAlignAuto: case YGAlignAuto:
break; break;
} }