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

Correctly size cross axis when measuring flex basis

Browse Source
This commit is contained in:
Emil Sjolander
2016-06-29 13:20:56 +01:00
parent d878091c4b
commit ca34ff4446
17 changed files with 362 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/__tests__/Layout-test.c
View File

@@ -4140,7 +4140,7 @@ int main()
node_0->layout.position[CSS_TOP] = 0;
node_0->layout.position[CSS_LEFT] = 0;
node_0->layout.dimensions[CSS_WIDTH] = 10;
node_0->layout.dimensions[CSS_HEIGHT] = 18;
node_0->layout.dimensions[CSS_HEIGHT] = 36;
}
test("should layout node with text and width", root_node, root_layout);
@@ -4512,7 +4512,7 @@ int main()
node_2 = node_1->get_child(node_1->context, 0);
node_2->layout.position[CSS_TOP] = 0;
node_2->layout.position[CSS_LEFT] = 0;
node_2->layout.dimensions[CSS_WIDTH] = 100;
node_2->layout.dimensions[CSS_WIDTH] = 60;
node_2->layout.dimensions[CSS_HEIGHT] = 36;
}
}
@@ -4698,7 +4698,7 @@ int main()
node_2->style.margin[CSS_START] = 20;
node_2->style.margin[CSS_END] = 20;
node_2->measure = measure;
node_2->context = "loooooooooong with space";
node_2->context = "small";
}
}
}
@@ -4724,7 +4724,7 @@ int main()
node_2 = node_1->get_child(node_1->context, 0);
node_2->layout.position[CSS_TOP] = 20;
node_2->layout.position[CSS_LEFT] = 20;
node_2->layout.dimensions[CSS_WIDTH] = 172;
node_2->layout.dimensions[CSS_WIDTH] = 35;
node_2->layout.dimensions[CSS_HEIGHT] = 18;
}
}
@@ -4755,7 +4755,7 @@ int main()
node_2->style.margin[CSS_START] = 20;
node_2->style.margin[CSS_END] = 20;
node_2->measure = measure;
node_2->context = "loooooooooong with space";
node_2->context = "small";
}
}
}
@@ -4780,8 +4780,8 @@ int main()
css_node_t *node_2;
node_2 = node_1->get_child(node_1->context, 0);
node_2->layout.position[CSS_TOP] = 20;
node_2->layout.position[CSS_LEFT] = 8;
node_2->layout.dimensions[CSS_WIDTH] = 172;
node_2->layout.position[CSS_LEFT] = 145;
node_2->layout.dimensions[CSS_WIDTH] = 35;
node_2->layout.dimensions[CSS_HEIGHT] = 18;
}
}