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

update C

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-22 17:37:55 -07:00
parent 3dbd168938
commit c63281a064
2 changed files with 2040 additions and 2618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Layout.c
View File

@@ -392,15 +392,15 @@ void layoutNode(css_node_t *node) {
} }
} }
} }
mainPos += getPaddingAndBorder(node, trailing[mainAxis]); mainPos += getPaddingAndBorder(node, trailing[mainAxis]);
crossDim += getPaddingAndBorder(node, leading[crossAxis]) + crossDim += getPaddingAndBorderAxis(node, crossAxis);
getPaddingAndBorder(node, trailing[crossAxis]);
if (isUndefined(node->layout.dimensions[dim[mainAxis]]) && !mainDimInStyle) { if (isUndefined(node->layout.dimensions[dim[mainAxis]]) && !mainDimInStyle) {
node->layout.dimensions[dim[mainAxis]] = mainPos > 0 ? mainPos : 0; node->layout.dimensions[dim[mainAxis]] = fmaxf(mainPos, getPaddingAndBorderAxis(node, mainAxis));
} }
if (isUndefined(node->layout.dimensions[dim[crossAxis]])) { if (isUndefined(node->layout.dimensions[dim[crossAxis]])) {
node->layout.dimensions[dim[crossAxis]] = crossDim > 0 ? crossDim : 0; node->layout.dimensions[dim[crossAxis]] = fmaxf(crossDim, getPaddingAndBorderAxis(node, crossAxis));
} }
for (int i = 0; i < node->children_count; ++i) { for (int i = 0; i < node->children_count; ++i) {

4650
src/__tests__/Layout-test.c
View File

File diff suppressed because it is too large Load Diff