flex and main axis margin

2014-04-22 09:38:17 -07:00
parent f5b738338d
commit bda6b23b8b
2 changed files with 15 additions and 2 deletions
--- a/src/Layout.js
+++ b/src/Layout.js
@@ -208,7 +208,9 @@ var computeLayout = (function() {
        for (var/*int*/ i = 0; i < node.children.length; ++i) {
          var/*css_node_t**/ child = node.children[i];
          if (getFlex(child)) {
-            child.layout[dim[mainAxis]] = flexibleMainDim;
+            child.layout[dim[mainAxis]] = flexibleMainDim -
+              getMargin(child, leading[mainAxis]) -
+              getMargin(child, trailing[mainAxis]);
            layoutNode(child);
          }
        }