Fix align-content: center, flex-end alignment with margin #477
@@ -1436,5 +1436,180 @@ namespace Facebook.Yoga
|
||||
Assert.AreEqual(100f, root_child0.LayoutHeight);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Test_margin_auto_left_right_child_bigger_than_parent()
|
||||
{
|
||||
YogaConfig config = new YogaConfig();
|
||||
|
||||
YogaNode root = new YogaNode(config);
|
||||
root.JustifyContent = YogaJustify.Center;
|
||||
root.PositionType = YogaPositionType.Absolute;
|
||||
root.Width = 52;
|
||||
root.Height = 52;
|
||||
|
||||
YogaNode root_child0 = new YogaNode(config);
|
||||
root_child0.MarginLeft = YogaValue.Auto();
|
||||
root_child0.MarginRight = YogaValue.Auto();
|
||||
root_child0.Width = 72;
|
||||
root_child0.Height = 72;
|
||||
root.Insert(0, root_child0);
|
||||
root.StyleDirection = YogaDirection.LTR;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(52f, root.LayoutWidth);
|
||||
Assert.AreEqual(52f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0.LayoutX);
|
||||
Assert.AreEqual(-10f, root_child0.LayoutY);
|
||||
Assert.AreEqual(72f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(72f, root_child0.LayoutHeight);
|
||||
|
||||
root.StyleDirection = YogaDirection.RTL;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(52f, root.LayoutWidth);
|
||||
Assert.AreEqual(52f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(-20f, root_child0.LayoutX);
|
||||
Assert.AreEqual(-10f, root_child0.LayoutY);
|
||||
Assert.AreEqual(72f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(72f, root_child0.LayoutHeight);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Test_margin_auto_left_child_bigger_than_parent()
|
||||
{
|
||||
YogaConfig config = new YogaConfig();
|
||||
|
||||
YogaNode root = new YogaNode(config);
|
||||
root.JustifyContent = YogaJustify.Center;
|
||||
root.PositionType = YogaPositionType.Absolute;
|
||||
root.Width = 52;
|
||||
root.Height = 52;
|
||||
|
||||
YogaNode root_child0 = new YogaNode(config);
|
||||
root_child0.MarginLeft = YogaValue.Auto();
|
||||
root_child0.Width = 72;
|
||||
root_child0.Height = 72;
|
||||
root.Insert(0, root_child0);
|
||||
root.StyleDirection = YogaDirection.LTR;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(52f, root.LayoutWidth);
|
||||
Assert.AreEqual(52f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0.LayoutX);
|
||||
Assert.AreEqual(-10f, root_child0.LayoutY);
|
||||
Assert.AreEqual(72f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(72f, root_child0.LayoutHeight);
|
||||
|
||||
root.StyleDirection = YogaDirection.RTL;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(52f, root.LayoutWidth);
|
||||
Assert.AreEqual(52f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(-20f, root_child0.LayoutX);
|
||||
Assert.AreEqual(-10f, root_child0.LayoutY);
|
||||
Assert.AreEqual(72f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(72f, root_child0.LayoutHeight);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Test_margin_fix_left_auto_right_child_bigger_than_parent()
|
||||
{
|
||||
YogaConfig config = new YogaConfig();
|
||||
|
||||
YogaNode root = new YogaNode(config);
|
||||
root.JustifyContent = YogaJustify.Center;
|
||||
root.PositionType = YogaPositionType.Absolute;
|
||||
root.Width = 52;
|
||||
root.Height = 52;
|
||||
|
||||
YogaNode root_child0 = new YogaNode(config);
|
||||
root_child0.MarginLeft = 10;
|
||||
root_child0.MarginRight = YogaValue.Auto();
|
||||
root_child0.Width = 72;
|
||||
root_child0.Height = 72;
|
||||
root.Insert(0, root_child0);
|
||||
root.StyleDirection = YogaDirection.LTR;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(52f, root.LayoutWidth);
|
||||
Assert.AreEqual(52f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(10f, root_child0.LayoutX);
|
||||
Assert.AreEqual(-10f, root_child0.LayoutY);
|
||||
Assert.AreEqual(72f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(72f, root_child0.LayoutHeight);
|
||||
|
||||
root.StyleDirection = YogaDirection.RTL;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(52f, root.LayoutWidth);
|
||||
Assert.AreEqual(52f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(-20f, root_child0.LayoutX);
|
||||
Assert.AreEqual(-10f, root_child0.LayoutY);
|
||||
Assert.AreEqual(72f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(72f, root_child0.LayoutHeight);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Test_margin_auto_left_fix_right_child_bigger_than_parent()
|
||||
{
|
||||
YogaConfig config = new YogaConfig();
|
||||
|
||||
YogaNode root = new YogaNode(config);
|
||||
root.JustifyContent = YogaJustify.Center;
|
||||
root.PositionType = YogaPositionType.Absolute;
|
||||
root.Width = 52;
|
||||
root.Height = 52;
|
||||
|
||||
YogaNode root_child0 = new YogaNode(config);
|
||||
root_child0.MarginLeft = YogaValue.Auto();
|
||||
root_child0.MarginRight = 10;
|
||||
root_child0.Width = 72;
|
||||
root_child0.Height = 72;
|
||||
root.Insert(0, root_child0);
|
||||
root.StyleDirection = YogaDirection.LTR;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(52f, root.LayoutWidth);
|
||||
Assert.AreEqual(52f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0.LayoutX);
|
||||
Assert.AreEqual(-10f, root_child0.LayoutY);
|
||||
Assert.AreEqual(72f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(72f, root_child0.LayoutHeight);
|
||||
|
||||
root.StyleDirection = YogaDirection.RTL;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(52f, root.LayoutWidth);
|
||||
Assert.AreEqual(52f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(-30f, root_child0.LayoutX);
|
||||
Assert.AreEqual(-10f, root_child0.LayoutY);
|
||||
Assert.AreEqual(72f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(72f, root_child0.LayoutHeight);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
@@ -124,3 +124,19 @@
|
||||
<div id="margin_should_not_be_part_of_max_width" style="width: 250px; height: 250px;">
|
||||
<div style="width: 100px; height: 100px; max-width: 100px; margin-left: 20px;"></div>
|
||||
</div>
|
||||
|
||||
<div id="margin_auto_left_right_child_bigger_than_parent" style="height: 52px; width: 52px; position: absolute; justify-content: center;">
|
||||
<div style="width: 72px; height: 72px; margin-left: auto; margin-right:auto;"></div>
|
||||
</div>
|
||||
|
||||
<div id="margin_auto_left_child_bigger_than_parent" style="height: 52px; width: 52px; position: absolute; justify-content: center;">
|
||||
<div style="width: 72px; height: 72px; margin-left: auto;"></div>
|
||||
</div>
|
||||
|
||||
<div id="margin_fix_left_auto_right_child_bigger_than_parent" style="height: 52px; width: 52px; position: absolute; justify-content: center;">
|
||||
<div style="width: 72px; height: 72px; margin-left: 10px; margin-right: auto;"></div>
|
||||
</div>
|
||||
|
||||
<div id="margin_auto_left_fix_right_child_bigger_than_parent" style="height: 52px; width: 52px; position: absolute; justify-content: center;">
|
||||
<div style="width: 72px; height: 72px; margin-left: auto; margin-right: 10px;"></div>
|
||||
</div>
|
||||
|
@@ -1408,4 +1408,175 @@ public class YGMarginTest {
|
||||
assertEquals(100f, root_child0.getLayoutHeight(), 0.0f);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_margin_auto_left_right_child_bigger_than_parent() {
|
||||
YogaConfig config = new YogaConfig();
|
||||
|
||||
final YogaNode root = new YogaNode(config);
|
||||
root.setJustifyContent(YogaJustify.CENTER);
|
||||
root.setPositionType(YogaPositionType.ABSOLUTE);
|
||||
root.setWidth(52f);
|
||||
root.setHeight(52f);
|
||||
|
||||
final YogaNode root_child0 = new YogaNode(config);
|
||||
root_child0.setMarginAuto(YogaEdge.LEFT);
|
||||
root_child0.setMarginAuto(YogaEdge.RIGHT);
|
||||
root_child0.setWidth(72f);
|
||||
root_child0.setHeight(72f);
|
||||
root.addChildAt(root_child0, 0);
|
||||
root.setDirection(YogaDirection.LTR);
|
||||
root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
|
||||
|
||||
assertEquals(0f, root.getLayoutX(), 0.0f);
|
||||
assertEquals(0f, root.getLayoutY(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutWidth(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutHeight(), 0.0f);
|
||||
|
||||
assertEquals(0f, root_child0.getLayoutX(), 0.0f);
|
||||
assertEquals(-10f, root_child0.getLayoutY(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutWidth(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutHeight(), 0.0f);
|
||||
|
||||
root.setDirection(YogaDirection.RTL);
|
||||
root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
|
||||
|
||||
assertEquals(0f, root.getLayoutX(), 0.0f);
|
||||
assertEquals(0f, root.getLayoutY(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutWidth(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutHeight(), 0.0f);
|
||||
|
||||
assertEquals(-20f, root_child0.getLayoutX(), 0.0f);
|
||||
assertEquals(-10f, root_child0.getLayoutY(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutWidth(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutHeight(), 0.0f);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_margin_auto_left_child_bigger_than_parent() {
|
||||
YogaConfig config = new YogaConfig();
|
||||
|
||||
final YogaNode root = new YogaNode(config);
|
||||
root.setJustifyContent(YogaJustify.CENTER);
|
||||
root.setPositionType(YogaPositionType.ABSOLUTE);
|
||||
root.setWidth(52f);
|
||||
root.setHeight(52f);
|
||||
|
||||
final YogaNode root_child0 = new YogaNode(config);
|
||||
root_child0.setMarginAuto(YogaEdge.LEFT);
|
||||
root_child0.setWidth(72f);
|
||||
root_child0.setHeight(72f);
|
||||
root.addChildAt(root_child0, 0);
|
||||
root.setDirection(YogaDirection.LTR);
|
||||
root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
|
||||
|
||||
assertEquals(0f, root.getLayoutX(), 0.0f);
|
||||
assertEquals(0f, root.getLayoutY(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutWidth(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutHeight(), 0.0f);
|
||||
|
||||
assertEquals(0f, root_child0.getLayoutX(), 0.0f);
|
||||
assertEquals(-10f, root_child0.getLayoutY(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutWidth(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutHeight(), 0.0f);
|
||||
|
||||
root.setDirection(YogaDirection.RTL);
|
||||
root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
|
||||
|
||||
assertEquals(0f, root.getLayoutX(), 0.0f);
|
||||
assertEquals(0f, root.getLayoutY(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutWidth(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutHeight(), 0.0f);
|
||||
|
||||
assertEquals(-20f, root_child0.getLayoutX(), 0.0f);
|
||||
assertEquals(-10f, root_child0.getLayoutY(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutWidth(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutHeight(), 0.0f);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_margin_fix_left_auto_right_child_bigger_than_parent() {
|
||||
YogaConfig config = new YogaConfig();
|
||||
|
||||
final YogaNode root = new YogaNode(config);
|
||||
root.setJustifyContent(YogaJustify.CENTER);
|
||||
root.setPositionType(YogaPositionType.ABSOLUTE);
|
||||
root.setWidth(52f);
|
||||
root.setHeight(52f);
|
||||
|
||||
final YogaNode root_child0 = new YogaNode(config);
|
||||
root_child0.setMargin(YogaEdge.LEFT, 10f);
|
||||
root_child0.setMarginAuto(YogaEdge.RIGHT);
|
||||
root_child0.setWidth(72f);
|
||||
root_child0.setHeight(72f);
|
||||
root.addChildAt(root_child0, 0);
|
||||
root.setDirection(YogaDirection.LTR);
|
||||
root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
|
||||
|
||||
assertEquals(0f, root.getLayoutX(), 0.0f);
|
||||
assertEquals(0f, root.getLayoutY(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutWidth(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutHeight(), 0.0f);
|
||||
|
||||
assertEquals(10f, root_child0.getLayoutX(), 0.0f);
|
||||
assertEquals(-10f, root_child0.getLayoutY(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutWidth(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutHeight(), 0.0f);
|
||||
|
||||
root.setDirection(YogaDirection.RTL);
|
||||
root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
|
||||
|
||||
assertEquals(0f, root.getLayoutX(), 0.0f);
|
||||
assertEquals(0f, root.getLayoutY(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutWidth(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutHeight(), 0.0f);
|
||||
|
||||
assertEquals(-20f, root_child0.getLayoutX(), 0.0f);
|
||||
assertEquals(-10f, root_child0.getLayoutY(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutWidth(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutHeight(), 0.0f);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_margin_auto_left_fix_right_child_bigger_than_parent() {
|
||||
YogaConfig config = new YogaConfig();
|
||||
|
||||
final YogaNode root = new YogaNode(config);
|
||||
root.setJustifyContent(YogaJustify.CENTER);
|
||||
root.setPositionType(YogaPositionType.ABSOLUTE);
|
||||
root.setWidth(52f);
|
||||
root.setHeight(52f);
|
||||
|
||||
final YogaNode root_child0 = new YogaNode(config);
|
||||
root_child0.setMarginAuto(YogaEdge.LEFT);
|
||||
root_child0.setMargin(YogaEdge.RIGHT, 10f);
|
||||
root_child0.setWidth(72f);
|
||||
root_child0.setHeight(72f);
|
||||
root.addChildAt(root_child0, 0);
|
||||
root.setDirection(YogaDirection.LTR);
|
||||
root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
|
||||
|
||||
assertEquals(0f, root.getLayoutX(), 0.0f);
|
||||
assertEquals(0f, root.getLayoutY(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutWidth(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutHeight(), 0.0f);
|
||||
|
||||
assertEquals(0f, root_child0.getLayoutX(), 0.0f);
|
||||
assertEquals(-10f, root_child0.getLayoutY(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutWidth(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutHeight(), 0.0f);
|
||||
|
||||
root.setDirection(YogaDirection.RTL);
|
||||
root.calculateLayout(YogaConstants.UNDEFINED, YogaConstants.UNDEFINED);
|
||||
|
||||
assertEquals(0f, root.getLayoutX(), 0.0f);
|
||||
assertEquals(0f, root.getLayoutY(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutWidth(), 0.0f);
|
||||
assertEquals(52f, root.getLayoutHeight(), 0.0f);
|
||||
|
||||
assertEquals(-30f, root_child0.getLayoutX(), 0.0f);
|
||||
assertEquals(-10f, root_child0.getLayoutY(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutWidth(), 0.0f);
|
||||
assertEquals(72f, root_child0.getLayoutHeight(), 0.0f);
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -1403,3 +1403,174 @@ it("margin_should_not_be_part_of_max_width", function () {
|
||||
}
|
||||
}
|
||||
});
|
||||
it("margin_auto_left_right_child_bigger_than_parent", function () {
|
||||
try {
|
||||
var root = Yoga.Node.create(config);
|
||||
root.setJustifyContent(Yoga.JUSTIFY_CENTER);
|
||||
root.setPositionType(Yoga.POSITION_TYPE_ABSOLUTE);
|
||||
root.setWidth(52);
|
||||
root.setHeight(52);
|
||||
|
||||
var root_child0 = Yoga.Node.create(config);
|
||||
root_child0.setMargin(Yoga.EDGE_LEFT, "auto");
|
||||
root_child0.setMargin(Yoga.EDGE_RIGHT, "auto");
|
||||
root_child0.setWidth(72);
|
||||
root_child0.setHeight(72);
|
||||
root.insertChild(root_child0, 0);
|
||||
root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
|
||||
|
||||
console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
|
||||
console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
|
||||
console.assert(52 === root.getComputedWidth(), "52 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
|
||||
console.assert(52 === root.getComputedHeight(), "52 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
|
||||
|
||||
console.assert(0 === root_child0.getComputedLeft(), "0 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
|
||||
console.assert(-10 === root_child0.getComputedTop(), "-10 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
|
||||
console.assert(72 === root_child0.getComputedWidth(), "72 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
|
||||
console.assert(72 === root_child0.getComputedHeight(), "72 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
|
||||
|
||||
root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_RTL);
|
||||
|
||||
console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
|
||||
console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
|
||||
console.assert(52 === root.getComputedWidth(), "52 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
|
||||
console.assert(52 === root.getComputedHeight(), "52 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
|
||||
|
||||
console.assert(-20 === root_child0.getComputedLeft(), "-20 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
|
||||
console.assert(-10 === root_child0.getComputedTop(), "-10 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
|
||||
console.assert(72 === root_child0.getComputedWidth(), "72 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
|
||||
console.assert(72 === root_child0.getComputedHeight(), "72 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
|
||||
} finally {
|
||||
if (typeof root !== "undefined") {
|
||||
root.freeRecursive();
|
||||
}
|
||||
}
|
||||
});
|
||||
it("margin_auto_left_child_bigger_than_parent", function () {
|
||||
try {
|
||||
var root = Yoga.Node.create(config);
|
||||
root.setJustifyContent(Yoga.JUSTIFY_CENTER);
|
||||
root.setPositionType(Yoga.POSITION_TYPE_ABSOLUTE);
|
||||
root.setWidth(52);
|
||||
root.setHeight(52);
|
||||
|
||||
var root_child0 = Yoga.Node.create(config);
|
||||
root_child0.setMargin(Yoga.EDGE_LEFT, "auto");
|
||||
root_child0.setWidth(72);
|
||||
root_child0.setHeight(72);
|
||||
root.insertChild(root_child0, 0);
|
||||
root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
|
||||
|
||||
console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
|
||||
console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
|
||||
console.assert(52 === root.getComputedWidth(), "52 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
|
||||
console.assert(52 === root.getComputedHeight(), "52 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
|
||||
|
||||
console.assert(0 === root_child0.getComputedLeft(), "0 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
|
||||
console.assert(-10 === root_child0.getComputedTop(), "-10 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
|
||||
console.assert(72 === root_child0.getComputedWidth(), "72 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
|
||||
console.assert(72 === root_child0.getComputedHeight(), "72 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
|
||||
|
||||
root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_RTL);
|
||||
|
||||
console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
|
||||
console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
|
||||
console.assert(52 === root.getComputedWidth(), "52 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
|
||||
console.assert(52 === root.getComputedHeight(), "52 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
|
||||
|
||||
console.assert(-20 === root_child0.getComputedLeft(), "-20 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
|
||||
console.assert(-10 === root_child0.getComputedTop(), "-10 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
|
||||
console.assert(72 === root_child0.getComputedWidth(), "72 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
|
||||
console.assert(72 === root_child0.getComputedHeight(), "72 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
|
||||
} finally {
|
||||
if (typeof root !== "undefined") {
|
||||
root.freeRecursive();
|
||||
}
|
||||
}
|
||||
});
|
||||
it("margin_fix_left_auto_right_child_bigger_than_parent", function () {
|
||||
try {
|
||||
var root = Yoga.Node.create(config);
|
||||
root.setJustifyContent(Yoga.JUSTIFY_CENTER);
|
||||
root.setPositionType(Yoga.POSITION_TYPE_ABSOLUTE);
|
||||
root.setWidth(52);
|
||||
root.setHeight(52);
|
||||
|
||||
var root_child0 = Yoga.Node.create(config);
|
||||
root_child0.setMargin(Yoga.EDGE_LEFT, 10);
|
||||
root_child0.setMargin(Yoga.EDGE_RIGHT, "auto");
|
||||
root_child0.setWidth(72);
|
||||
root_child0.setHeight(72);
|
||||
root.insertChild(root_child0, 0);
|
||||
root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
|
||||
|
||||
console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
|
||||
console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
|
||||
console.assert(52 === root.getComputedWidth(), "52 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
|
||||
console.assert(52 === root.getComputedHeight(), "52 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
|
||||
|
||||
console.assert(10 === root_child0.getComputedLeft(), "10 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
|
||||
console.assert(-10 === root_child0.getComputedTop(), "-10 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
|
||||
console.assert(72 === root_child0.getComputedWidth(), "72 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
|
||||
console.assert(72 === root_child0.getComputedHeight(), "72 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
|
||||
|
||||
root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_RTL);
|
||||
|
||||
console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
|
||||
console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
|
||||
console.assert(52 === root.getComputedWidth(), "52 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
|
||||
console.assert(52 === root.getComputedHeight(), "52 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
|
||||
|
||||
console.assert(-20 === root_child0.getComputedLeft(), "-20 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
|
||||
console.assert(-10 === root_child0.getComputedTop(), "-10 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
|
||||
console.assert(72 === root_child0.getComputedWidth(), "72 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
|
||||
console.assert(72 === root_child0.getComputedHeight(), "72 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
|
||||
} finally {
|
||||
if (typeof root !== "undefined") {
|
||||
root.freeRecursive();
|
||||
}
|
||||
}
|
||||
});
|
||||
it("margin_auto_left_fix_right_child_bigger_than_parent", function () {
|
||||
try {
|
||||
var root = Yoga.Node.create(config);
|
||||
root.setJustifyContent(Yoga.JUSTIFY_CENTER);
|
||||
root.setPositionType(Yoga.POSITION_TYPE_ABSOLUTE);
|
||||
root.setWidth(52);
|
||||
root.setHeight(52);
|
||||
|
||||
var root_child0 = Yoga.Node.create(config);
|
||||
root_child0.setMargin(Yoga.EDGE_LEFT, "auto");
|
||||
root_child0.setMargin(Yoga.EDGE_RIGHT, 10);
|
||||
root_child0.setWidth(72);
|
||||
root_child0.setHeight(72);
|
||||
root.insertChild(root_child0, 0);
|
||||
root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_LTR);
|
||||
|
||||
console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
|
||||
console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
|
||||
console.assert(52 === root.getComputedWidth(), "52 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
|
||||
console.assert(52 === root.getComputedHeight(), "52 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
|
||||
|
||||
console.assert(0 === root_child0.getComputedLeft(), "0 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
|
||||
console.assert(-10 === root_child0.getComputedTop(), "-10 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
|
||||
console.assert(72 === root_child0.getComputedWidth(), "72 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
|
||||
console.assert(72 === root_child0.getComputedHeight(), "72 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
|
||||
|
||||
root.calculateLayout(Yoga.UNDEFINED, Yoga.UNDEFINED, Yoga.DIRECTION_RTL);
|
||||
|
||||
console.assert(0 === root.getComputedLeft(), "0 === root.getComputedLeft() (" + root.getComputedLeft() + ")");
|
||||
console.assert(0 === root.getComputedTop(), "0 === root.getComputedTop() (" + root.getComputedTop() + ")");
|
||||
console.assert(52 === root.getComputedWidth(), "52 === root.getComputedWidth() (" + root.getComputedWidth() + ")");
|
||||
console.assert(52 === root.getComputedHeight(), "52 === root.getComputedHeight() (" + root.getComputedHeight() + ")");
|
||||
|
||||
console.assert(-30 === root_child0.getComputedLeft(), "-30 === root_child0.getComputedLeft() (" + root_child0.getComputedLeft() + ")");
|
||||
console.assert(-10 === root_child0.getComputedTop(), "-10 === root_child0.getComputedTop() (" + root_child0.getComputedTop() + ")");
|
||||
console.assert(72 === root_child0.getComputedWidth(), "72 === root_child0.getComputedWidth() (" + root_child0.getComputedWidth() + ")");
|
||||
console.assert(72 === root_child0.getComputedHeight(), "72 === root_child0.getComputedHeight() (" + root_child0.getComputedHeight() + ")");
|
||||
} finally {
|
||||
if (typeof root !== "undefined") {
|
||||
root.freeRecursive();
|
||||
}
|
||||
}
|
||||
});
|
||||
|
@@ -1430,3 +1430,178 @@ 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);
|
||||
YGNodeStyleSetPositionType(root, YGPositionTypeAbsolute);
|
||||
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);
|
||||
YGNodeStyleSetPositionType(root, YGPositionTypeAbsolute);
|
||||
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);
|
||||
YGNodeStyleSetPositionType(root, YGPositionTypeAbsolute);
|
||||
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);
|
||||
YGNodeStyleSetPositionType(root, YGPositionTypeAbsolute);
|
||||
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);
|
||||
}
|
||||
|
@@ -2731,11 +2731,11 @@ static void YGNodelayoutImpl(const YGNodeRef node,
|
||||
|
||||
if (YGMarginLeadingValue(child, crossAxis)->unit == YGUnitAuto &&
|
||||
YGMarginTrailingValue(child, crossAxis)->unit == YGUnitAuto) {
|
||||
leadingCrossDim += remainingCrossDim / 2;
|
||||
leadingCrossDim += fmaxf(0.0f, remainingCrossDim / 2);
|
||||
} else if (YGMarginTrailingValue(child, crossAxis)->unit == YGUnitAuto) {
|
||||
// No-Op
|
||||
} else if (YGMarginLeadingValue(child, crossAxis)->unit == YGUnitAuto) {
|
||||
leadingCrossDim += remainingCrossDim;
|
||||
leadingCrossDim += fmaxf(0.0f, remainingCrossDim);
|
||||
} else if (alignItem == YGAlignFlexStart) {
|
||||
// No-Op
|
||||
} else if (alignItem == YGAlignCenter) {
|
||||
|
Reference in New Issue
Block a user