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

Margin should affect parent dimensions

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-10 09:29:06 -07:00
parent 1452aa7e7b
commit 1b79c9c215
2 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Layout.js
View File

@@ -154,8 +154,12 @@ function computeLayout(node) {
betweenMainDim;
if (child.layout[dim[crossAxis]] !== undefined) {
if (child.layout[dim[crossAxis]] > crossDim) {
crossDim = child.layout[dim[crossAxis]];
var childCrossDim = child.layout[dim[crossAxis]] +
getMargin(leading[crossAxis], child) +
getMargin(trailing[crossAxis], child);
if (childCrossDim > crossDim) {
crossDim = childCrossDim;
}
}
});
@@ -178,7 +182,9 @@ function computeLayout(node) {
} else if (alignItem === 'flex-end') {
leadingCrossDim = remainingCrossDim;
} else if (alignItem === 'stretch') {
child.layout[dim[crossAxis]] = node.layout[dim[crossAxis]];
child.layout[dim[crossAxis]] = node.layout[dim[crossAxis]] -
getMargin(leading[crossAxis], child) -
getMargin(trailing[crossAxis], child);
}
child.layout[pos[crossAxis]] += leadingCrossDim;
});