left and right, first pass

This commit is contained in:
Christopher Chedeau
2014-06-12 10:05:00 -07:00
parent 7c157cbb50
commit cc11a535ce
2 changed files with 18 additions and 1 deletions

View File

@@ -475,7 +475,7 @@ var computeLayout = (function() {
// In case the child is absolutely positionned and has a
// top/left/bottom/right being set, we override all the previously
// computed positions to set it correctly.
if (leadingPos && !trailingPos) {
if (leadingPos) {
child.layout[pos[crossAxis]] =
getPosition(child, leading[crossAxis]) +
getBorder(node, leading[crossAxis]) +
@@ -488,6 +488,12 @@ var computeLayout = (function() {
getMargin(child, trailing[crossAxis]) -
getPosition(child, trailing[crossAxis]);
}
if (leadingPos && trailingPos) {
child.layout[dim[crossAxis]] =
node.layout[dim[crossAxis]] -
getMargin(child, trailing[crossAxis]) -
getPosition(child, trailing[crossAxis]);
}
} else {
var/*float*/ leadingCrossDim = getPaddingAndBorder(node, leading[crossAxis]);