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

better handling for padding in a top/bottom or left/right configuration

Browse Source
This commit is contained in:
Christopher Chedeau
2014-06-12 11:52:07 -07:00
parent 900beefa1e
commit a36820d15e
2 changed files with 39 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/Layout.js
View File

@@ -490,12 +490,13 @@ var computeLayout = (function() {
getPaddingAndBorderAxis(node, mainAxis)
);
} else {
child.layout[dim[mainAxis]] = fmaxf(0,
child.layout[dim[mainAxis]] = fmaxf(
getPaddingAndBorderAxis(child, mainAxis),
node.layout[dim[mainAxis]] -
child.layout[pos[mainAxis]] -
getMargin(child, trailing[mainAxis]) -
getPosition(child, trailing[mainAxis])
) + getPaddingAndBorderAxis(child, mainAxis);
);
}
}
}
@@ -528,12 +529,20 @@ var computeLayout = (function() {
getPosition(child, trailing[crossAxis]);
}
if (leadingPos && trailingPos) {
child.layout[dim[crossAxis]] = fmaxf(0,
node.layout[dim[crossAxis]] -
child.layout[pos[crossAxis]] -
getMargin(child, trailing[crossAxis]) -
getPosition(child, trailing[crossAxis])
);
if (isDimDefined(child, crossAxis)) {
child.layout[dim[crossAxis]] = fmaxf(
child.style[dim[crossAxis]],
getPaddingAndBorderAxis(node, crossAxis)
);
} else {
child.layout[dim[crossAxis]] = fmaxf(
getPaddingAndBorderAxis(child, crossAxis),
node.layout[dim[crossAxis]] -
child.layout[pos[crossAxis]] -
getMargin(child, trailing[crossAxis]) -
getPosition(child, trailing[crossAxis])
);
}
}
} else {
var/*float*/ leadingCrossDim = getPaddingAndBorder(node, leading[crossAxis]);