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

fix edge case of flex: 1

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-15 16:39:42 -07:00
parent 8ebd69437a
commit 9313d3d11e
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Layout.js
View File

@@ -66,6 +66,10 @@ function computeLayout(node) {
return 'column';
}
function getFlex(node) {
return node.style.flex === 1;
}
var axis = {
left: 'horizontal',
right: 'horizontal',
@@ -109,7 +113,7 @@ function computeLayout(node) {
var mainContentDim = 0;
var flexibleChildrenCount = 0;
children.forEach(function(child) {
if (!child.style.flex) {
if (node.layout[dim[mainAxis]] === undefined || !getFlex(child)) {
layoutNode(child);
mainContentDim += child.layout[dim[mainAxis]] +
getMargin(leading[mainAxis], child) +
@@ -126,7 +130,7 @@ function computeLayout(node) {
if (flexibleChildrenCount) {
var flexibleMainDim = remainingMainDim / flexibleChildrenCount;
children.forEach(function(child) {
if (child.style.flex) {
if (getFlex(child)) {
child.layout[dim[mainAxis]] = flexibleMainDim;
layoutNode(child);
}