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

code review changes and tests for child firstline and per baseline override

Browse Source
This commit is contained in:
Lukas Woehrl
2017-01-05 20:40:46 +01:00
parent cf7a7c5b83
commit 315161743f
6 changed files with 731 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

232
tests/YGAlignItemsTest.cpp
View File

@@ -279,6 +279,238 @@ TEST(YogaTest, align_baseline_child) {
YGNodeFreeRecursive(root);
}
TEST(YogaTest, align_baseline_child_multiline) {
const YGNodeRef root = YGNodeNew();
YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
YGNodeStyleSetAlignItems(root, YGAlignBaseline);
YGNodeStyleSetWidth(root, 100);
YGNodeStyleSetHeight(root, 100);
const YGNodeRef root_child0 = YGNodeNew();
YGNodeStyleSetWidth(root_child0, 50);
YGNodeStyleSetHeight(root_child0, 60);
YGNodeInsertChild(root, root_child0, 0);
const YGNodeRef root_child1 = YGNodeNew();
YGNodeStyleSetFlexDirection(root_child1, YGFlexDirectionRow);
YGNodeStyleSetFlexWrap(root_child1, YGWrapWrap);
YGNodeStyleSetWidth(root_child1, 50);
YGNodeStyleSetHeight(root_child1, 25);
YGNodeInsertChild(root, root_child1, 1);
const YGNodeRef root_child1_child0 = YGNodeNew();
YGNodeStyleSetWidth(root_child1_child0, 25);
YGNodeStyleSetHeight(root_child1_child0, 20);
YGNodeInsertChild(root_child1, root_child1_child0, 0);
const YGNodeRef root_child1_child1 = YGNodeNew();
YGNodeStyleSetWidth(root_child1_child1, 25);
YGNodeStyleSetHeight(root_child1_child1, 10);
YGNodeInsertChild(root_child1, root_child1_child1, 1);
const YGNodeRef root_child1_child2 = YGNodeNew();
YGNodeStyleSetWidth(root_child1_child2, 25);
YGNodeStyleSetHeight(root_child1_child2, 20);
YGNodeInsertChild(root_child1, root_child1_child2, 2);
const YGNodeRef root_child1_child3 = YGNodeNew();
YGNodeStyleSetWidth(root_child1_child3, 25);
YGNodeStyleSetHeight(root_child1_child3, 10);
YGNodeInsertChild(root_child1, root_child1_child3, 3);
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(100, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(100, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(60, YGNodeLayoutGetHeight(root_child0));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetLeft(root_child1));
ASSERT_FLOAT_EQ(40, YGNodeLayoutGetTop(root_child1));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetHeight(root_child1));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child0));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child0));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child0));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child1));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child1));
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child1));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child2));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child2));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child2));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child2));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child3));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child3));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child3));
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child3));
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionRTL);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(100, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(100, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(60, YGNodeLayoutGetHeight(root_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1));
ASSERT_FLOAT_EQ(40, YGNodeLayoutGetTop(root_child1));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetHeight(root_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child0));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child0));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child1));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child1));
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child2));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child2));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child2));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child2));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child3));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child3));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child3));
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child3));
YGNodeFreeRecursive(root);
}
TEST(YogaTest, align_baseline_child_multiline_override) {
const YGNodeRef root = YGNodeNew();
YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);
YGNodeStyleSetAlignItems(root, YGAlignBaseline);
YGNodeStyleSetWidth(root, 100);
YGNodeStyleSetHeight(root, 100);
const YGNodeRef root_child0 = YGNodeNew();
YGNodeStyleSetWidth(root_child0, 50);
YGNodeStyleSetHeight(root_child0, 60);
YGNodeInsertChild(root, root_child0, 0);
const YGNodeRef root_child1 = YGNodeNew();
YGNodeStyleSetFlexDirection(root_child1, YGFlexDirectionRow);
YGNodeStyleSetFlexWrap(root_child1, YGWrapWrap);
YGNodeStyleSetWidth(root_child1, 50);
YGNodeStyleSetHeight(root_child1, 25);
YGNodeInsertChild(root, root_child1, 1);
const YGNodeRef root_child1_child0 = YGNodeNew();
YGNodeStyleSetWidth(root_child1_child0, 25);
YGNodeStyleSetHeight(root_child1_child0, 20);
YGNodeInsertChild(root_child1, root_child1_child0, 0);
const YGNodeRef root_child1_child1 = YGNodeNew();
YGNodeStyleSetAlignSelf(root_child1_child1, YGAlignBaseline);
YGNodeStyleSetWidth(root_child1_child1, 25);
YGNodeStyleSetHeight(root_child1_child1, 10);
YGNodeInsertChild(root_child1, root_child1_child1, 1);
const YGNodeRef root_child1_child2 = YGNodeNew();
YGNodeStyleSetWidth(root_child1_child2, 25);
YGNodeStyleSetHeight(root_child1_child2, 20);
YGNodeInsertChild(root_child1, root_child1_child2, 2);
const YGNodeRef root_child1_child3 = YGNodeNew();
YGNodeStyleSetAlignSelf(root_child1_child3, YGAlignBaseline);
YGNodeStyleSetWidth(root_child1_child3, 25);
YGNodeStyleSetHeight(root_child1_child3, 10);
YGNodeInsertChild(root_child1, root_child1_child3, 3);
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(100, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(100, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(60, YGNodeLayoutGetHeight(root_child0));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetLeft(root_child1));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetTop(root_child1));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetHeight(root_child1));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child0));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child0));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child0));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child1));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child1));
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child1));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child2));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child2));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child2));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child2));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child3));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child3));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child3));
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child3));
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionRTL);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(100, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(100, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(60, YGNodeLayoutGetHeight(root_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetTop(root_child1));
ASSERT_FLOAT_EQ(50, YGNodeLayoutGetWidth(root_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetHeight(root_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child0));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child0));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child0));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child1));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root_child1_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child1));
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child1));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetLeft(root_child1_child2));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child2));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child2));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetHeight(root_child1_child2));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child1_child3));
ASSERT_FLOAT_EQ(20, YGNodeLayoutGetTop(root_child1_child3));
ASSERT_FLOAT_EQ(25, YGNodeLayoutGetWidth(root_child1_child3));
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetHeight(root_child1_child3));
YGNodeFreeRecursive(root);
}
TEST(YogaTest, align_baseline_child_top) {
const YGNodeRef root = YGNodeNew();
YGNodeStyleSetFlexDirection(root, YGFlexDirectionRow);