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

Modify children position instead of passing it from above

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-05 12:33:12 -07:00
parent d0ae1ea690
commit 34f994ae56
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Layout.js
View File

@@ -36,7 +36,7 @@ function computeLayout(node) {
column: 'height' column: 'height'
}; };
function layoutNode(node, parent) { function layoutNode(node) {
var mainAxis = node.style.flexDirection === 'row' ? 'row' : 'column'; var mainAxis = node.style.flexDirection === 'row' ? 'row' : 'column';
var crossAxis = mainAxis === 'row' ? 'column' : 'row'; var crossAxis = mainAxis === 'row' ? 'column' : 'row';
@@ -48,10 +48,9 @@ function computeLayout(node) {
var mainPos = 0; var mainPos = 0;
var children = []; var children = [];
(node.children || []).forEach(function(child) { (node.children || []).forEach(function(child) {
var offset = {}; child.layout[pos[mainAxis]] = mainPos;
offset[pos[mainAxis]] = mainPos; child.layout[pos[crossAxis]] = 0;
offset[pos[crossAxis]] = 0; layoutNode(child);
layoutNode(child, offset);
mainPos += child.layout[dim[mainAxis]] + 2 * getMargin(child); mainPos += child.layout[dim[mainAxis]] + 2 * getMargin(child);
}); });
@@ -60,12 +59,15 @@ function computeLayout(node) {
node.layout[dim[mainAxis]] = mainPos; node.layout[dim[mainAxis]] = mainPos;
} }
node.layout[dim[crossAxis]] = node.style[dim[crossAxis]]; node.layout[dim[crossAxis]] = node.style[dim[crossAxis]];
node.layout.top = getMargin(node) + parent.top; node.layout.top += getMargin(node);
node.layout.left = getMargin(node) + parent.left; node.layout.left += getMargin(node);
} }
fillNodes(node); fillNodes(node);
layoutNode(node, {top: 0, left: 0}); node.layout.top = 0;
node.layout.left = 0;
layoutNode(node);
return extractNodes(node); return extractNodes(node);
} }