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

wooooot, padding works!

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-16 15:09:53 -07:00
parent a67c193bef
commit 93ee721ba8
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spec/LayoutSpec.js
View File

@@ -512,7 +512,6 @@ describe('Layout', function() {
);
});
it('should layout node with inner & outer padding and stretch', function() {
testLayout(
{style: {padding: 50}, children: [
@@ -524,6 +523,22 @@ describe('Layout', function() {
);
});
it('should layout node with stretch and child with margin', function() {
testLayout(
{style: {}, children: [
{style: {alignSelf: 'stretch'}, children: [
{style: {margin: 16}}
]}
]},
{width: 32, height: 32, top: 0, left: 0, children: [
{width: 32, height: 32, top: 0, left: 0, children: [
{width: 0, height: 0, top: 16, left: 16}
]}
]}
);
});
it('should layout randomly', function() {
function RNG(seed) {
this.state = seed;

6
src/Layout.js
View File

@@ -202,13 +202,11 @@ function computeLayout(node) {
} else if (alignItem === 'flex-end') {
leadingCrossDim += remainingCrossDim;
} else if (alignItem === 'stretch') {
child.layout[dim[crossAxis]] += node.layout[dim[crossAxis]] -
child.layout[dim[crossAxis]] = node.layout[dim[crossAxis]] -
getPadding(node, leading[crossAxis]) -
getPadding(node, trailing[crossAxis]) -
getMargin(child, leading[crossAxis]) -
getMargin(child, trailing[crossAxis]) -
getPadding(child, leading[crossAxis]) -
getPadding(child, trailing[crossAxis]);
getMargin(child, trailing[crossAxis]);
}
child.layout[pos[crossAxis]] += leadingCrossDim;
});