Merge pull request Flipboard#41 from mbrgm/master

Michael Johnston · Michael Johnston · commit f20e5e0720e4 · 2015-02-17T10:57:06.000-08:00
Fix parent position when walking child nodes
diff --git a/lib/layoutNode.js b/lib/layoutNode.js
@@ -37,7 +37,7 @@ function walkNode (node, parentLeft, parentTop) {
   node.layer.frame.height = node.layout.height;
   if (node.children && node.children.length > 0) {
     node.children.forEach(function (child) {
-      walkNode(child, node.layout.left, node.layout.top);
+      walkNode(child, node.layer.frame.x, node.layer.frame.y);
     });
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ function walkNode (node, parentLeft, parentTop) {`
`37`	`37`	`node.layer.frame.height = node.layout.height;`
`38`	`38`	`if (node.children && node.children.length > 0) {`
`39`	`39`	`node.children.forEach(function (child) {`
`40`		`- walkNode(child, node.layout.left, node.layout.top);`
	`40`	`+ walkNode(child, node.layer.frame.x, node.layer.frame.y);`
`41`	`41`	`});`
`42`	`42`	`}`
`43`	`43`	`}`