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

overlapping left and right + workaround chrome bug

Browse Source
This commit is contained in:
Christopher Chedeau
2014-06-12 11:27:49 -07:00
parent 694e181b8e
commit 842d654b0f
3 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Layout.js
View File

@@ -484,11 +484,12 @@ var computeLayout = (function() {
getPosition(child, trailing[mainAxis]);
}
if (leadingPos && trailingPos) {
child.layout[dim[mainAxis]] =
child.layout[dim[mainAxis]] = fmaxf(0,
node.layout[dim[mainAxis]] -
child.layout[pos[mainAxis]] -
getMargin(child, trailing[mainAxis]) -
getPosition(child, trailing[mainAxis]);
getPosition(child, trailing[mainAxis])
);
}
}
}
@@ -520,11 +521,12 @@ var computeLayout = (function() {
getPosition(child, trailing[crossAxis]);
}
if (leadingPos && trailingPos) {
child.layout[dim[crossAxis]] =
child.layout[dim[crossAxis]] = fmaxf(0,
node.layout[dim[crossAxis]] -
child.layout[pos[crossAxis]] -
getMargin(child, trailing[crossAxis]) -
getPosition(child, trailing[crossAxis]);
getPosition(child, trailing[crossAxis])
);
}
} else {
var/*float*/ leadingCrossDim = getPaddingAndBorder(node, leading[crossAxis]);