fix stretch with margin

2014-04-15 17:53:38 -07:00
parent 1a0cce4f42
commit 930c4dc700
2 changed files with 16 additions and 3 deletions
--- a/src/Layout.js
+++ b/src/Layout.js
@@ -189,7 +189,9 @@ function computeLayout(node) {
      } else if (alignItem === 'flex-end') {
        leadingCrossDim = remainingCrossDim;
      } else if (alignItem === 'stretch') {
-        child.layout[dim[crossAxis]] = getDimWithMargin(node, crossAxis);
+        child.layout[dim[crossAxis]] = node.layout[dim[crossAxis]] -
+          getMargin(leading[crossAxis], child) -
+          getMargin(trailing[crossAxis], child);
      }
      child.layout[pos[crossAxis]] += leadingCrossDim;
    });