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

auto reduce test cases in randomly generated tests and fix position absolute within space-around

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-22 09:32:49 -07:00
parent 37c518943e
commit f5b738338d
3 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Layout.js
View File

@@ -180,12 +180,15 @@ var computeLayout = (function() {
var/*float*/ mainContentDim = 0;
var/*int*/ flexibleChildrenCount = 0;
var/*int*/ absoluteChildrenCount = 0;
for (var/*int*/ i = 0; i < node.children.length; ++i) {
var/*css_node_t**/ child = node.children[i];
if (isUndefined(node.layout[dim[mainAxis]]) || !getFlex(child)) {
layoutNode(child);
if (getPositionType(child) === 'relative') {
mainContentDim += getDimWithMargin(child, mainAxis);
} else {
absoluteChildrenCount++;
}
} else {
flexibleChildrenCount++;
@@ -218,9 +221,9 @@ var computeLayout = (function() {
} else if (justifyContent == CSS_JUSTIFY_FLEX_END) {
leadingMainDim = remainingMainDim;
} else if (justifyContent == CSS_JUSTIFY_SPACE_BETWEEN) {
betweenMainDim = remainingMainDim / (node.children.length - 1);
betweenMainDim = remainingMainDim / (node.children.length - absoluteChildrenCount - 1);
} else if (justifyContent == CSS_JUSTIFY_SPACE_AROUND) {
betweenMainDim = remainingMainDim / node.children.length;
betweenMainDim = remainingMainDim / (node.children.length - absoluteChildrenCount);
leadingMainDim = betweenMainDim / 2;
}
}