Fix typo causing wrapped children to be sized by wrong axis margin
Summary: Fixes https://github.com/facebook/yoga/issues/548 Reviewed By: passy Differential Revision: D5044470 fbshipit-source-id: 7d203dd48b258a5fe5c4b3c493099092a1d334db
This commit is contained in:
committed by
Facebook Github Bot
parent
488a7c1fe0
commit
b2b0c7ee37
@@ -1643,5 +1643,103 @@ namespace Facebook.Yoga
|
||||
Assert.AreEqual(40f, root_child0_child1_child0.LayoutHeight);
|
||||
}
|
||||
|
||||
[Test]
|
||||
public void Test_wrap_nodes_with_content_sizing_margin_cross()
|
||||
{
|
||||
YogaConfig config = new YogaConfig();
|
||||
|
||||
YogaNode root = new YogaNode(config);
|
||||
root.Width = 500;
|
||||
root.Height = 500;
|
||||
|
||||
YogaNode root_child0 = new YogaNode(config);
|
||||
root_child0.FlexDirection = YogaFlexDirection.Row;
|
||||
root_child0.Wrap = YogaWrap.Wrap;
|
||||
root_child0.Width = 70;
|
||||
root.Insert(0, root_child0);
|
||||
|
||||
YogaNode root_child0_child0 = new YogaNode(config);
|
||||
root_child0.Insert(0, root_child0_child0);
|
||||
|
||||
YogaNode root_child0_child0_child0 = new YogaNode(config);
|
||||
root_child0_child0_child0.Width = 40;
|
||||
root_child0_child0_child0.Height = 40;
|
||||
root_child0_child0.Insert(0, root_child0_child0_child0);
|
||||
|
||||
YogaNode root_child0_child1 = new YogaNode(config);
|
||||
root_child0_child1.MarginTop = 10;
|
||||
root_child0.Insert(1, root_child0_child1);
|
||||
|
||||
YogaNode root_child0_child1_child0 = new YogaNode(config);
|
||||
root_child0_child1_child0.Width = 40;
|
||||
root_child0_child1_child0.Height = 40;
|
||||
root_child0_child1.Insert(0, root_child0_child1_child0);
|
||||
root.StyleDirection = YogaDirection.LTR;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(500f, root.LayoutWidth);
|
||||
Assert.AreEqual(500f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0.LayoutX);
|
||||
Assert.AreEqual(0f, root_child0.LayoutY);
|
||||
Assert.AreEqual(70f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(90f, root_child0.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0_child0.LayoutX);
|
||||
Assert.AreEqual(0f, root_child0_child0.LayoutY);
|
||||
Assert.AreEqual(40f, root_child0_child0.LayoutWidth);
|
||||
Assert.AreEqual(40f, root_child0_child0.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
|
||||
Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
|
||||
Assert.AreEqual(40f, root_child0_child0_child0.LayoutWidth);
|
||||
Assert.AreEqual(40f, root_child0_child0_child0.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0_child1.LayoutX);
|
||||
Assert.AreEqual(50f, root_child0_child1.LayoutY);
|
||||
Assert.AreEqual(40f, root_child0_child1.LayoutWidth);
|
||||
Assert.AreEqual(40f, root_child0_child1.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0_child1_child0.LayoutX);
|
||||
Assert.AreEqual(0f, root_child0_child1_child0.LayoutY);
|
||||
Assert.AreEqual(40f, root_child0_child1_child0.LayoutWidth);
|
||||
Assert.AreEqual(40f, root_child0_child1_child0.LayoutHeight);
|
||||
|
||||
root.StyleDirection = YogaDirection.RTL;
|
||||
root.CalculateLayout();
|
||||
|
||||
Assert.AreEqual(0f, root.LayoutX);
|
||||
Assert.AreEqual(0f, root.LayoutY);
|
||||
Assert.AreEqual(500f, root.LayoutWidth);
|
||||
Assert.AreEqual(500f, root.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(430f, root_child0.LayoutX);
|
||||
Assert.AreEqual(0f, root_child0.LayoutY);
|
||||
Assert.AreEqual(70f, root_child0.LayoutWidth);
|
||||
Assert.AreEqual(90f, root_child0.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(30f, root_child0_child0.LayoutX);
|
||||
Assert.AreEqual(0f, root_child0_child0.LayoutY);
|
||||
Assert.AreEqual(40f, root_child0_child0.LayoutWidth);
|
||||
Assert.AreEqual(40f, root_child0_child0.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0_child0_child0.LayoutX);
|
||||
Assert.AreEqual(0f, root_child0_child0_child0.LayoutY);
|
||||
Assert.AreEqual(40f, root_child0_child0_child0.LayoutWidth);
|
||||
Assert.AreEqual(40f, root_child0_child0_child0.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(30f, root_child0_child1.LayoutX);
|
||||
Assert.AreEqual(50f, root_child0_child1.LayoutY);
|
||||
Assert.AreEqual(40f, root_child0_child1.LayoutWidth);
|
||||
Assert.AreEqual(40f, root_child0_child1.LayoutHeight);
|
||||
|
||||
Assert.AreEqual(0f, root_child0_child1_child0.LayoutX);
|
||||
Assert.AreEqual(0f, root_child0_child1_child0.LayoutY);
|
||||
Assert.AreEqual(40f, root_child0_child1_child0.LayoutWidth);
|
||||
Assert.AreEqual(40f, root_child0_child1_child0.LayoutHeight);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user