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

handling when height/width is smaller than the padding

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-21 17:07:05 -07:00
parent 97c4109434
commit a17fc43756
3 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Layout.js
View File

@@ -158,12 +158,20 @@ var computeLayout = (function() {
var/*bool*/ mainDimInStyle = isDimDefined(node, mainAxis);
if (isUndefined(node.layout[dim[mainAxis]]) && mainDimInStyle) {
node.layout[dim[mainAxis]] = node.style[dim[mainAxis]];
node.layout[dim[mainAxis]] = Math.max(
node.style[dim[mainAxis]],
getPadding(node, leading[mainAxis]) +
getPadding(node, trailing[mainAxis])
);
}
var/*bool*/ crossDimInStyle = isDimDefined(node, crossAxis);
if (isUndefined(node.layout[dim[crossAxis]]) && crossDimInStyle) {
node.layout[dim[crossAxis]] = node.style[dim[crossAxis]];
node.layout[dim[crossAxis]] = Math.max(
node.style[dim[crossAxis]],
getPadding(node, leading[crossAxis]) +
getPadding(node, trailing[crossAxis])
);
}
var/*float*/ mainContentDim = 0;