layout flex-end should take into account margin

2014-04-14 12:00:16 -07:00
parent 57dd9e3e28
commit d65d15cc41
2 changed files with 17 additions and 1 deletions
--- a/src/Layout.js
+++ b/src/Layout.js
@@ -111,7 +111,9 @@ function computeLayout(node) {
    children.forEach(function(child) {
      if (!child.style.flex) {
        layoutNode(child);
-        mainContentDim += child.layout[dim[mainAxis]];
+        mainContentDim += child.layout[dim[mainAxis]] +
+          getMargin(leading[mainAxis], child) +
+          getMargin(trailing[mainAxis], child);
      } else {
        flexibleChildrenCount++;
      }