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

Fix align-content: center, flex-end alignment with margin

Browse Source 
Summary:
This fixes ```align-content: center``` and ```align-content: flex-end``` when the child exceeds the parents size. See #476. It also fixes those layouts if the child has ```margin: auto``` set.
Closes https://github.com/facebook/yoga/pull/477

Differential Revision: D4697833

Pulled By: emilsjolander

fbshipit-source-id: d081ec7ea559a5f2bd3271c3a4dc272960beddfa
This commit is contained in:
Lukas Wöhrl
2017-03-15 05:20:38 -07:00
committed by Facebook Github Bot
parent 11052053d8
commit b94466e502
11 changed files with 1623 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
tests/YGMarginTest.cpp
View File

@@ -1430,3 +1430,174 @@ TEST(YogaTest, margin_should_not_be_part_of_max_width) {
YGConfigFree(config);
}
TEST(YogaTest, margin_auto_left_right_child_bigger_than_parent) {
const YGConfigRef config = YGConfigNew();
const YGNodeRef root = YGNodeNewWithConfig(config);
YGNodeStyleSetJustifyContent(root, YGJustifyCenter);
YGNodeStyleSetWidth(root, 52);
YGNodeStyleSetHeight(root, 52);
const YGNodeRef root_child0 = YGNodeNewWithConfig(config);
YGNodeStyleSetMarginAuto(root_child0, YGEdgeLeft);
YGNodeStyleSetMarginAuto(root_child0, YGEdgeRight);
YGNodeStyleSetWidth(root_child0, 72);
YGNodeStyleSetHeight(root_child0, 72);
YGNodeInsertChild(root, root_child0, 0);
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(-10, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetHeight(root_child0));
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionRTL);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(-20, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(-10, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetHeight(root_child0));
YGNodeFreeRecursive(root);
YGConfigFree(config);
}
TEST(YogaTest, margin_auto_left_child_bigger_than_parent) {
const YGConfigRef config = YGConfigNew();
const YGNodeRef root = YGNodeNewWithConfig(config);
YGNodeStyleSetJustifyContent(root, YGJustifyCenter);
YGNodeStyleSetWidth(root, 52);
YGNodeStyleSetHeight(root, 52);
const YGNodeRef root_child0 = YGNodeNewWithConfig(config);
YGNodeStyleSetMarginAuto(root_child0, YGEdgeLeft);
YGNodeStyleSetWidth(root_child0, 72);
YGNodeStyleSetHeight(root_child0, 72);
YGNodeInsertChild(root, root_child0, 0);
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(-10, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetHeight(root_child0));
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionRTL);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(-20, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(-10, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetHeight(root_child0));
YGNodeFreeRecursive(root);
YGConfigFree(config);
}
TEST(YogaTest, margin_fix_left_auto_right_child_bigger_than_parent) {
const YGConfigRef config = YGConfigNew();
const YGNodeRef root = YGNodeNewWithConfig(config);
YGNodeStyleSetJustifyContent(root, YGJustifyCenter);
YGNodeStyleSetWidth(root, 52);
YGNodeStyleSetHeight(root, 52);
const YGNodeRef root_child0 = YGNodeNewWithConfig(config);
YGNodeStyleSetMargin(root_child0, YGEdgeLeft, 10);
YGNodeStyleSetMarginAuto(root_child0, YGEdgeRight);
YGNodeStyleSetWidth(root_child0, 72);
YGNodeStyleSetHeight(root_child0, 72);
YGNodeInsertChild(root, root_child0, 0);
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(10, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(-10, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetHeight(root_child0));
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionRTL);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(-20, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(-10, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetHeight(root_child0));
YGNodeFreeRecursive(root);
YGConfigFree(config);
}
TEST(YogaTest, margin_auto_left_fix_right_child_bigger_than_parent) {
const YGConfigRef config = YGConfigNew();
const YGNodeRef root = YGNodeNewWithConfig(config);
YGNodeStyleSetJustifyContent(root, YGJustifyCenter);
YGNodeStyleSetWidth(root, 52);
YGNodeStyleSetHeight(root, 52);
const YGNodeRef root_child0 = YGNodeNewWithConfig(config);
YGNodeStyleSetMarginAuto(root_child0, YGEdgeLeft);
YGNodeStyleSetMargin(root_child0, YGEdgeRight, 10);
YGNodeStyleSetWidth(root_child0, 72);
YGNodeStyleSetHeight(root_child0, 72);
YGNodeInsertChild(root, root_child0, 0);
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionLTR);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(-10, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetHeight(root_child0));
YGNodeCalculateLayout(root, YGUndefined, YGUndefined, YGDirectionRTL);
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetLeft(root));
ASSERT_FLOAT_EQ(0, YGNodeLayoutGetTop(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetWidth(root));
ASSERT_FLOAT_EQ(52, YGNodeLayoutGetHeight(root));
ASSERT_FLOAT_EQ(-30, YGNodeLayoutGetLeft(root_child0));
ASSERT_FLOAT_EQ(-10, YGNodeLayoutGetTop(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetWidth(root_child0));
ASSERT_FLOAT_EQ(72, YGNodeLayoutGetHeight(root_child0));
YGNodeFreeRecursive(root);
YGConfigFree(config);
}