diff --git a/csharp/Facebook.Yoga/YogaNode.cs b/csharp/Facebook.Yoga/YogaNode.cs index 17a1c072..112d2b3f 100644 --- a/csharp/Facebook.Yoga/YogaNode.cs +++ b/csharp/Facebook.Yoga/YogaNode.cs @@ -333,12 +333,6 @@ namespace Facebook.Yoga } } - [Obsolete("use LayoutMargin properties")] - public float GetLayoutMargin(YogaEdge edge) - { - return Native.YGNodeLayoutGetMargin(_ygNode, edge); - } - [Obsolete("use LayoutPadding properties")] public float GetLayoutPadding(YogaEdge edge) { diff --git a/csharp/tests/Facebook.Yoga/YogaNodeTest.cs b/csharp/tests/Facebook.Yoga/YogaNodeTest.cs index 69aa0bf3..291fb4af 100644 --- a/csharp/tests/Facebook.Yoga/YogaNodeTest.cs +++ b/csharp/tests/Facebook.Yoga/YogaNodeTest.cs @@ -434,6 +434,23 @@ namespace Facebook.Yoga }); } + [Test] + public void TestLayoutMargin() { + YogaNode node = new YogaNode(); + node.Width = 100; + node.Height = 100; + node.MarginStart = 1; + node.MarginEnd = 2; + node.MarginTop = 3; + node.MarginBottom = 4; + node.CalculateLayout(); + + Assert.AreEqual(1, node.LayoutMarginLeft); + Assert.AreEqual(2, node.LayoutMarginRight); + Assert.AreEqual(3, node.LayoutMarginTop); + Assert.AreEqual(4, node.LayoutMarginBottom); + } + [Test] public void TestLayoutPadding() { YogaNode node = new YogaNode(); diff --git a/java/tests/com/facebook/yoga/YogaNodeTest.java b/java/tests/com/facebook/yoga/YogaNodeTest.java index 53104dfb..9d72bb15 100644 --- a/java/tests/com/facebook/yoga/YogaNodeTest.java +++ b/java/tests/com/facebook/yoga/YogaNodeTest.java @@ -168,6 +168,23 @@ public class YogaNodeTest { assertEquals(100, (int) node0.getMaxHeight().value); } + @Test + public void testLayoutMargin() { + final YogaNode node = new YogaNode(); + node.setWidth(100); + node.setHeight(100); + node.setMargin(YogaEdge.START, 1); + node.setMargin(YogaEdge.END, 2); + node.setMargin(YogaEdge.TOP, 3); + node.setMargin(YogaEdge.BOTTOM, 4); + node.calculateLayout(); + + assertEquals(1, (int) node.getLayoutMargin(YogaEdge.LEFT)); + assertEquals(2, (int) node.getLayoutMargin(YogaEdge.RIGHT)); + assertEquals(3, (int) node.getLayoutMargin(YogaEdge.TOP)); + assertEquals(4, (int) node.getLayoutMargin(YogaEdge.BOTTOM)); + } + @Test public void testLayoutPadding() { final YogaNode node = new YogaNode();