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

multiple flex and margin

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-22 09:53:54 -07:00
parent fce826f18b
commit 4dd147e92a
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Layout.js
View File

@@ -193,7 +193,9 @@ var computeLayout = (function() {
} else {
flexibleChildrenCount++;
mainContentDim += getPadding(child, leading[mainAxis]) +
getPadding(child, trailing[mainAxis]);
getPadding(child, trailing[mainAxis]) +
getMargin(child, leading[mainAxis]) +
getMargin(child, trailing[mainAxis]);
}
}
@@ -210,9 +212,7 @@ var computeLayout = (function() {
for (var/*int*/ i = 0; i < node.children.length; ++i) {
var/*css_node_t**/ child = node.children[i];
if (getFlex(child)) {
child.layout[dim[mainAxis]] = flexibleMainDim -
getMargin(child, leading[mainAxis]) -
getMargin(child, trailing[mainAxis]) +
child.layout[dim[mainAxis]] = flexibleMainDim +
getPadding(child, leading[mainAxis]) +
getPadding(child, trailing[mainAxis]);
layoutNode(child);

12
src/__tests__/Layout-test.js
View File

@@ -632,6 +632,18 @@ describe('Layout', function() {
);
});
it('should layout node with multiple flex and margin', function() {
testLayout(
{style: {width: 700, flexDirection: 'row'}, children: [
{style: {flex: 1}},
{style: {marginLeft: 5, flex: 1}}
]},
{width: 700, height: 0, top: 0, left: 0, children: [
{width: 347.5, height: 0, top: 0, left: 0},
{width: 347.5, height: 0, top: 0, left: 352.5}
]}
)
});
it('should layout randomly', function() {
function RNG(seed) {