multiple flex and padding

This commit is contained in:
Christopher Chedeau
2014-04-22 09:48:33 -07:00
parent bda6b23b8b
commit fce826f18b
2 changed files with 21 additions and 3 deletions

View File

@@ -192,6 +192,8 @@ var computeLayout = (function() {
}
} else {
flexibleChildrenCount++;
mainContentDim += getPadding(child, leading[mainAxis]) +
getPadding(child, trailing[mainAxis]);
}
}
@@ -210,7 +212,9 @@ var computeLayout = (function() {
if (getFlex(child)) {
child.layout[dim[mainAxis]] = flexibleMainDim -
getMargin(child, leading[mainAxis]) -
getMargin(child, trailing[mainAxis]);
getMargin(child, trailing[mainAxis]) +
getPadding(child, leading[mainAxis]) +
getPadding(child, trailing[mainAxis]);
layoutNode(child);
}
}