Skip to content

Commit 6fc870b

Browse files
committed
more renaming
1 parent 8e04906 commit 6fc870b

6 files changed

+108
-108
lines changed

align_items_test.go

+24-24
Original file line numberDiff line numberDiff line change
@@ -1750,10 +1750,10 @@ func TestAlign_center_should_size_based_on_content(t *testing.T) {
17501750
NodeStyleSetFlexShrink(rootChild0Child0, 1)
17511751
NodeInsertChild(rootChild0, rootChild0Child0, 0)
17521752

1753-
rootChild0Child0_child0 := NewNodeWithConfig(config)
1754-
NodeStyleSetWidth(rootChild0Child0_child0, 20)
1755-
NodeStyleSetHeight(rootChild0Child0_child0, 20)
1756-
NodeInsertChild(rootChild0Child0, rootChild0Child0_child0, 0)
1753+
rootChild0Child0Child0 := NewNodeWithConfig(config)
1754+
NodeStyleSetWidth(rootChild0Child0Child0, 20)
1755+
NodeStyleSetHeight(rootChild0Child0Child0, 20)
1756+
NodeInsertChild(rootChild0Child0, rootChild0Child0Child0, 0)
17571757
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
17581758

17591759
assertFloatEqual(t, 0, root.LayoutGetLeft())
@@ -1771,10 +1771,10 @@ func TestAlign_center_should_size_based_on_content(t *testing.T) {
17711771
assertFloatEqual(t, 20, rootChild0Child0.LayoutGetWidth())
17721772
assertFloatEqual(t, 20, rootChild0Child0.LayoutGetHeight())
17731773

1774-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
1775-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1776-
assertFloatEqual(t, 20, rootChild0Child0_child0.LayoutGetWidth())
1777-
assertFloatEqual(t, 20, rootChild0Child0_child0.LayoutGetHeight())
1774+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
1775+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1776+
assertFloatEqual(t, 20, rootChild0Child0Child0.LayoutGetWidth())
1777+
assertFloatEqual(t, 20, rootChild0Child0Child0.LayoutGetHeight())
17781778

17791779
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
17801780

@@ -1793,10 +1793,10 @@ func TestAlign_center_should_size_based_on_content(t *testing.T) {
17931793
assertFloatEqual(t, 20, rootChild0Child0.LayoutGetWidth())
17941794
assertFloatEqual(t, 20, rootChild0Child0.LayoutGetHeight())
17951795

1796-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
1797-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1798-
assertFloatEqual(t, 20, rootChild0Child0_child0.LayoutGetWidth())
1799-
assertFloatEqual(t, 20, rootChild0Child0_child0.LayoutGetHeight())
1796+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
1797+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1798+
assertFloatEqual(t, 20, rootChild0Child0Child0.LayoutGetWidth())
1799+
assertFloatEqual(t, 20, rootChild0Child0Child0.LayoutGetHeight())
18001800

18011801
}
18021802

@@ -1818,10 +1818,10 @@ func TestAlign_strech_should_size_based_on_parent(t *testing.T) {
18181818
NodeStyleSetFlexShrink(rootChild0Child0, 1)
18191819
NodeInsertChild(rootChild0, rootChild0Child0, 0)
18201820

1821-
rootChild0Child0_child0 := NewNodeWithConfig(config)
1822-
NodeStyleSetWidth(rootChild0Child0_child0, 20)
1823-
NodeStyleSetHeight(rootChild0Child0_child0, 20)
1824-
NodeInsertChild(rootChild0Child0, rootChild0Child0_child0, 0)
1821+
rootChild0Child0Child0 := NewNodeWithConfig(config)
1822+
NodeStyleSetWidth(rootChild0Child0Child0, 20)
1823+
NodeStyleSetHeight(rootChild0Child0Child0, 20)
1824+
NodeInsertChild(rootChild0Child0, rootChild0Child0Child0, 0)
18251825
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
18261826

18271827
assertFloatEqual(t, 0, root.LayoutGetLeft())
@@ -1839,10 +1839,10 @@ func TestAlign_strech_should_size_based_on_parent(t *testing.T) {
18391839
assertFloatEqual(t, 100, rootChild0Child0.LayoutGetWidth())
18401840
assertFloatEqual(t, 20, rootChild0Child0.LayoutGetHeight())
18411841

1842-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
1843-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1844-
assertFloatEqual(t, 20, rootChild0Child0_child0.LayoutGetWidth())
1845-
assertFloatEqual(t, 20, rootChild0Child0_child0.LayoutGetHeight())
1842+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
1843+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1844+
assertFloatEqual(t, 20, rootChild0Child0Child0.LayoutGetWidth())
1845+
assertFloatEqual(t, 20, rootChild0Child0Child0.LayoutGetHeight())
18461846

18471847
NodeCalculateLayout(root, Undefined, Undefined, DirectionRTL)
18481848

@@ -1861,9 +1861,9 @@ func TestAlign_strech_should_size_based_on_parent(t *testing.T) {
18611861
assertFloatEqual(t, 100, rootChild0Child0.LayoutGetWidth())
18621862
assertFloatEqual(t, 20, rootChild0Child0.LayoutGetHeight())
18631863

1864-
assertFloatEqual(t, 80, rootChild0Child0_child0.LayoutGetLeft())
1865-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1866-
assertFloatEqual(t, 20, rootChild0Child0_child0.LayoutGetWidth())
1867-
assertFloatEqual(t, 20, rootChild0Child0_child0.LayoutGetHeight())
1864+
assertFloatEqual(t, 80, rootChild0Child0Child0.LayoutGetLeft())
1865+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1866+
assertFloatEqual(t, 20, rootChild0Child0Child0.LayoutGetWidth())
1867+
assertFloatEqual(t, 20, rootChild0Child0Child0.LayoutGetHeight())
18681868

18691869
}

compute_margin_test.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ func TestComputed_layout_margin(t *testing.T) {
66
root := NewNode()
77
NodeStyleSetWidth(root, 100)
88
NodeStyleSetHeight(root, 100)
9-
YGNodeStyleSetMarginPercent(root, EdgeStart, 10)
9+
root.StyleSetMarginPercent(EdgeStart, 10)
1010

1111
NodeCalculateLayout(root, 100, 100, DirectionLTR)
1212

13-
assertFloatEqual(t, 10, NodeLayoutGetMargin(root, EdgeLeft))
14-
assertFloatEqual(t, 0, NodeLayoutGetMargin(root, EdgeRight))
13+
assertFloatEqual(t, 10, root.LayoutGetMargin(EdgeLeft))
14+
assertFloatEqual(t, 0, root.LayoutGetMargin(EdgeRight))
1515

1616
NodeCalculateLayout(root, 100, 100, DirectionRTL)
1717

18-
assertFloatEqual(t, 0, NodeLayoutGetMargin(root, EdgeLeft))
19-
assertFloatEqual(t, 10, NodeLayoutGetMargin(root, EdgeRight))
18+
assertFloatEqual(t, 0, root.LayoutGetMargin(EdgeLeft))
19+
assertFloatEqual(t, 10, root.LayoutGetMargin(EdgeRight))
2020
}

default_values_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ func TestAssert_default_values(t *testing.T) {
6767
assertFloatEqual(t, 0, root.LayoutGetRight())
6868
assertFloatEqual(t, 0, root.LayoutGetBottom())
6969

70-
assertFloatEqual(t, 0, NodeLayoutGetMargin(root, EdgeLeft))
71-
assertFloatEqual(t, 0, NodeLayoutGetMargin(root, EdgeTop))
72-
assertFloatEqual(t, 0, NodeLayoutGetMargin(root, EdgeRight))
73-
assertFloatEqual(t, 0, NodeLayoutGetMargin(root, EdgeBottom))
70+
assertFloatEqual(t, 0, root.LayoutGetMargin(EdgeLeft))
71+
assertFloatEqual(t, 0, root.LayoutGetMargin(EdgeTop))
72+
assertFloatEqual(t, 0, root.LayoutGetMargin(EdgeRight))
73+
assertFloatEqual(t, 0, root.LayoutGetMargin(EdgeBottom))
7474

7575
assertFloatEqual(t, 0, NodeLayoutGetPadding(root, EdgeLeft))
7676
assertFloatEqual(t, 0, NodeLayoutGetPadding(root, EdgeTop))

flex_wrap_test.go

+36-36
Original file line numberDiff line numberDiff line change
@@ -402,10 +402,10 @@ func TestFlex_wrap_wrap_to_child_height(t *testing.T) {
402402
NodeStyleSetWidth(rootChild0Child0, 100)
403403
NodeInsertChild(rootChild0, rootChild0Child0, 0)
404404

405-
rootChild0Child0_child0 := NewNodeWithConfig(config)
406-
NodeStyleSetWidth(rootChild0Child0_child0, 100)
407-
NodeStyleSetHeight(rootChild0Child0_child0, 100)
408-
NodeInsertChild(rootChild0Child0, rootChild0Child0_child0, 0)
405+
rootChild0Child0Child0 := NewNodeWithConfig(config)
406+
NodeStyleSetWidth(rootChild0Child0Child0, 100)
407+
NodeStyleSetHeight(rootChild0Child0Child0, 100)
408+
NodeInsertChild(rootChild0Child0, rootChild0Child0Child0, 0)
409409

410410
rootChild1 := NewNodeWithConfig(config)
411411
NodeStyleSetWidth(rootChild1, 100)
@@ -428,10 +428,10 @@ func TestFlex_wrap_wrap_to_child_height(t *testing.T) {
428428
assertFloatEqual(t, 100, rootChild0Child0.LayoutGetWidth())
429429
assertFloatEqual(t, 100, rootChild0Child0.LayoutGetHeight())
430430

431-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
432-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
433-
assertFloatEqual(t, 100, rootChild0Child0_child0.LayoutGetWidth())
434-
assertFloatEqual(t, 100, rootChild0Child0_child0.LayoutGetHeight())
431+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
432+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
433+
assertFloatEqual(t, 100, rootChild0Child0Child0.LayoutGetWidth())
434+
assertFloatEqual(t, 100, rootChild0Child0Child0.LayoutGetHeight())
435435

436436
assertFloatEqual(t, 0, rootChild1.LayoutGetLeft())
437437
assertFloatEqual(t, 100, rootChild1.LayoutGetTop())
@@ -455,10 +455,10 @@ func TestFlex_wrap_wrap_to_child_height(t *testing.T) {
455455
assertFloatEqual(t, 100, rootChild0Child0.LayoutGetWidth())
456456
assertFloatEqual(t, 100, rootChild0Child0.LayoutGetHeight())
457457

458-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
459-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
460-
assertFloatEqual(t, 100, rootChild0Child0_child0.LayoutGetWidth())
461-
assertFloatEqual(t, 100, rootChild0Child0_child0.LayoutGetHeight())
458+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
459+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
460+
assertFloatEqual(t, 100, rootChild0Child0Child0.LayoutGetWidth())
461+
assertFloatEqual(t, 100, rootChild0Child0Child0.LayoutGetHeight())
462462

463463
assertFloatEqual(t, 0, rootChild1.LayoutGetLeft())
464464
assertFloatEqual(t, 100, rootChild1.LayoutGetTop())
@@ -1476,10 +1476,10 @@ func TestWrap_nodes_with_content_sizing_overflowing_margin(t *testing.T) {
14761476
rootChild0Child0 := NewNodeWithConfig(config)
14771477
NodeInsertChild(rootChild0, rootChild0Child0, 0)
14781478

1479-
rootChild0Child0_child0 := NewNodeWithConfig(config)
1480-
NodeStyleSetWidth(rootChild0Child0_child0, 40)
1481-
NodeStyleSetHeight(rootChild0Child0_child0, 40)
1482-
NodeInsertChild(rootChild0Child0, rootChild0Child0_child0, 0)
1479+
rootChild0Child0Child0 := NewNodeWithConfig(config)
1480+
NodeStyleSetWidth(rootChild0Child0Child0, 40)
1481+
NodeStyleSetHeight(rootChild0Child0Child0, 40)
1482+
NodeInsertChild(rootChild0Child0, rootChild0Child0Child0, 0)
14831483

14841484
rootChild0child1 := NewNodeWithConfig(config)
14851485
NodeStyleSetMargin(rootChild0child1, EdgeRight, 10)
@@ -1506,10 +1506,10 @@ func TestWrap_nodes_with_content_sizing_overflowing_margin(t *testing.T) {
15061506
assertFloatEqual(t, 40, rootChild0Child0.LayoutGetWidth())
15071507
assertFloatEqual(t, 40, rootChild0Child0.LayoutGetHeight())
15081508

1509-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
1510-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1511-
assertFloatEqual(t, 40, rootChild0Child0_child0.LayoutGetWidth())
1512-
assertFloatEqual(t, 40, rootChild0Child0_child0.LayoutGetHeight())
1509+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
1510+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1511+
assertFloatEqual(t, 40, rootChild0Child0Child0.LayoutGetWidth())
1512+
assertFloatEqual(t, 40, rootChild0Child0Child0.LayoutGetHeight())
15131513

15141514
assertFloatEqual(t, 0, rootChild0child1.LayoutGetLeft())
15151515
assertFloatEqual(t, 40, rootChild0child1.LayoutGetTop())
@@ -1538,10 +1538,10 @@ func TestWrap_nodes_with_content_sizing_overflowing_margin(t *testing.T) {
15381538
assertFloatEqual(t, 40, rootChild0Child0.LayoutGetWidth())
15391539
assertFloatEqual(t, 40, rootChild0Child0.LayoutGetHeight())
15401540

1541-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
1542-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1543-
assertFloatEqual(t, 40, rootChild0Child0_child0.LayoutGetWidth())
1544-
assertFloatEqual(t, 40, rootChild0Child0_child0.LayoutGetHeight())
1541+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
1542+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1543+
assertFloatEqual(t, 40, rootChild0Child0Child0.LayoutGetWidth())
1544+
assertFloatEqual(t, 40, rootChild0Child0Child0.LayoutGetHeight())
15451545

15461546
assertFloatEqual(t, 35, rootChild0child1.LayoutGetLeft())
15471547
assertFloatEqual(t, 40, rootChild0child1.LayoutGetTop())
@@ -1570,10 +1570,10 @@ func TestWrap_nodes_with_content_sizing_margin_cross(t *testing.T) {
15701570
rootChild0Child0 := NewNodeWithConfig(config)
15711571
NodeInsertChild(rootChild0, rootChild0Child0, 0)
15721572

1573-
rootChild0Child0_child0 := NewNodeWithConfig(config)
1574-
NodeStyleSetWidth(rootChild0Child0_child0, 40)
1575-
NodeStyleSetHeight(rootChild0Child0_child0, 40)
1576-
NodeInsertChild(rootChild0Child0, rootChild0Child0_child0, 0)
1573+
rootChild0Child0Child0 := NewNodeWithConfig(config)
1574+
NodeStyleSetWidth(rootChild0Child0Child0, 40)
1575+
NodeStyleSetHeight(rootChild0Child0Child0, 40)
1576+
NodeInsertChild(rootChild0Child0, rootChild0Child0Child0, 0)
15771577

15781578
rootChild0child1 := NewNodeWithConfig(config)
15791579
NodeStyleSetMargin(rootChild0child1, EdgeTop, 10)
@@ -1600,10 +1600,10 @@ func TestWrap_nodes_with_content_sizing_margin_cross(t *testing.T) {
16001600
assertFloatEqual(t, 40, rootChild0Child0.LayoutGetWidth())
16011601
assertFloatEqual(t, 40, rootChild0Child0.LayoutGetHeight())
16021602

1603-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
1604-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1605-
assertFloatEqual(t, 40, rootChild0Child0_child0.LayoutGetWidth())
1606-
assertFloatEqual(t, 40, rootChild0Child0_child0.LayoutGetHeight())
1603+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
1604+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1605+
assertFloatEqual(t, 40, rootChild0Child0Child0.LayoutGetWidth())
1606+
assertFloatEqual(t, 40, rootChild0Child0Child0.LayoutGetHeight())
16071607

16081608
assertFloatEqual(t, 0, rootChild0child1.LayoutGetLeft())
16091609
assertFloatEqual(t, 50, rootChild0child1.LayoutGetTop())
@@ -1632,10 +1632,10 @@ func TestWrap_nodes_with_content_sizing_margin_cross(t *testing.T) {
16321632
assertFloatEqual(t, 40, rootChild0Child0.LayoutGetWidth())
16331633
assertFloatEqual(t, 40, rootChild0Child0.LayoutGetHeight())
16341634

1635-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
1636-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1637-
assertFloatEqual(t, 40, rootChild0Child0_child0.LayoutGetWidth())
1638-
assertFloatEqual(t, 40, rootChild0Child0_child0.LayoutGetHeight())
1635+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
1636+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1637+
assertFloatEqual(t, 40, rootChild0Child0Child0.LayoutGetWidth())
1638+
assertFloatEqual(t, 40, rootChild0Child0Child0.LayoutGetHeight())
16391639

16401640
assertFloatEqual(t, 30, rootChild0child1.LayoutGetLeft())
16411641
assertFloatEqual(t, 50, rootChild0child1.LayoutGetTop())

percentage_test.go

+35-35
Original file line numberDiff line numberDiff line change
@@ -625,17 +625,17 @@ func TestPercentage_multiple_nested_with_padding_margin_and_percentage_values(t
625625
NodeStyleSetWidthPercent(rootChild0Child0, 50)
626626
NodeInsertChild(rootChild0, rootChild0Child0, 0)
627627

628-
rootChild0Child0_child0 := NewNodeWithConfig(config)
629-
YGNodeStyleSetMarginPercent(rootChild0Child0_child0, EdgeLeft, 5)
630-
YGNodeStyleSetMarginPercent(rootChild0Child0_child0, EdgeTop, 5)
631-
YGNodeStyleSetMarginPercent(rootChild0Child0_child0, EdgeRight, 5)
632-
YGNodeStyleSetMarginPercent(rootChild0Child0_child0, EdgeBottom, 5)
633-
NodeStyleSetPadding(rootChild0Child0_child0, EdgeLeft, 3)
634-
NodeStyleSetPadding(rootChild0Child0_child0, EdgeTop, 3)
635-
NodeStyleSetPadding(rootChild0Child0_child0, EdgeRight, 3)
636-
NodeStyleSetPadding(rootChild0Child0_child0, EdgeBottom, 3)
637-
NodeStyleSetWidthPercent(rootChild0Child0_child0, 45)
638-
NodeInsertChild(rootChild0Child0, rootChild0Child0_child0, 0)
628+
rootChild0Child0Child0 := NewNodeWithConfig(config)
629+
rootChild0Child0Child0.StyleSetMarginPercent(EdgeLeft, 5)
630+
rootChild0Child0Child0.StyleSetMarginPercent(EdgeTop, 5)
631+
rootChild0Child0Child0.StyleSetMarginPercent(EdgeRight, 5)
632+
rootChild0Child0Child0.StyleSetMarginPercent(EdgeBottom, 5)
633+
NodeStyleSetPadding(rootChild0Child0Child0, EdgeLeft, 3)
634+
NodeStyleSetPadding(rootChild0Child0Child0, EdgeTop, 3)
635+
NodeStyleSetPadding(rootChild0Child0Child0, EdgeRight, 3)
636+
NodeStyleSetPadding(rootChild0Child0Child0, EdgeBottom, 3)
637+
NodeStyleSetWidthPercent(rootChild0Child0Child0, 45)
638+
NodeInsertChild(rootChild0Child0, rootChild0Child0Child0, 0)
639639

640640
rootChild1 := NewNodeWithConfig(config)
641641
NodeStyleSetFlexGrow(rootChild1, 4)
@@ -659,10 +659,10 @@ func TestPercentage_multiple_nested_with_padding_margin_and_percentage_values(t
659659
assertFloatEqual(t, 92, rootChild0Child0.LayoutGetWidth())
660660
assertFloatEqual(t, 25, rootChild0Child0.LayoutGetHeight())
661661

662-
assertFloatEqual(t, 10, rootChild0Child0_child0.LayoutGetLeft())
663-
assertFloatEqual(t, 10, rootChild0Child0_child0.LayoutGetTop())
664-
assertFloatEqual(t, 36, rootChild0Child0_child0.LayoutGetWidth())
665-
assertFloatEqual(t, 6, rootChild0Child0_child0.LayoutGetHeight())
662+
assertFloatEqual(t, 10, rootChild0Child0Child0.LayoutGetLeft())
663+
assertFloatEqual(t, 10, rootChild0Child0Child0.LayoutGetTop())
664+
assertFloatEqual(t, 36, rootChild0Child0Child0.LayoutGetWidth())
665+
assertFloatEqual(t, 6, rootChild0Child0Child0.LayoutGetHeight())
666666

667667
assertFloatEqual(t, 0, rootChild1.LayoutGetLeft())
668668
assertFloatEqual(t, 58, rootChild1.LayoutGetTop())
@@ -686,10 +686,10 @@ func TestPercentage_multiple_nested_with_padding_margin_and_percentage_values(t
686686
assertFloatEqual(t, 92, rootChild0Child0.LayoutGetWidth())
687687
assertFloatEqual(t, 25, rootChild0Child0.LayoutGetHeight())
688688

689-
assertFloatEqual(t, 46, rootChild0Child0_child0.LayoutGetLeft())
690-
assertFloatEqual(t, 10, rootChild0Child0_child0.LayoutGetTop())
691-
assertFloatEqual(t, 36, rootChild0Child0_child0.LayoutGetWidth())
692-
assertFloatEqual(t, 6, rootChild0Child0_child0.LayoutGetHeight())
689+
assertFloatEqual(t, 46, rootChild0Child0Child0.LayoutGetLeft())
690+
assertFloatEqual(t, 10, rootChild0Child0Child0.LayoutGetTop())
691+
assertFloatEqual(t, 36, rootChild0Child0Child0.LayoutGetWidth())
692+
assertFloatEqual(t, 6, rootChild0Child0Child0.LayoutGetHeight())
693693

694694
assertFloatEqual(t, 0, rootChild1.LayoutGetLeft())
695695
assertFloatEqual(t, 58, rootChild1.LayoutGetTop())
@@ -706,10 +706,10 @@ func TestPercentage_margin_should_calculate_based_only_on_width(t *testing.T) {
706706

707707
rootChild0 := NewNodeWithConfig(config)
708708
NodeStyleSetFlexGrow(rootChild0, 1)
709-
YGNodeStyleSetMarginPercent(rootChild0, EdgeLeft, 10)
710-
YGNodeStyleSetMarginPercent(rootChild0, EdgeTop, 10)
711-
YGNodeStyleSetMarginPercent(rootChild0, EdgeRight, 10)
712-
YGNodeStyleSetMarginPercent(rootChild0, EdgeBottom, 10)
709+
rootChild0.StyleSetMarginPercent(EdgeLeft, 10)
710+
rootChild0.StyleSetMarginPercent(EdgeTop, 10)
711+
rootChild0.StyleSetMarginPercent(EdgeRight, 10)
712+
rootChild0.StyleSetMarginPercent(EdgeBottom, 10)
713713
NodeInsertChild(root, rootChild0, 0)
714714

715715
rootChild0Child0 := NewNodeWithConfig(config)
@@ -974,10 +974,10 @@ func TestPercentage_container_in_wrapping_container(t *testing.T) {
974974
NodeStyleSetWidthPercent(rootChild0Child0, 100)
975975
NodeInsertChild(rootChild0, rootChild0Child0, 0)
976976

977-
rootChild0Child0_child0 := NewNodeWithConfig(config)
978-
NodeStyleSetWidth(rootChild0Child0_child0, 50)
979-
NodeStyleSetHeight(rootChild0Child0_child0, 50)
980-
NodeInsertChild(rootChild0Child0, rootChild0Child0_child0, 0)
977+
rootChild0Child0Child0 := NewNodeWithConfig(config)
978+
NodeStyleSetWidth(rootChild0Child0Child0, 50)
979+
NodeStyleSetHeight(rootChild0Child0Child0, 50)
980+
NodeInsertChild(rootChild0Child0, rootChild0Child0Child0, 0)
981981

982982
rootChild0Child0_child1 := NewNodeWithConfig(config)
983983
NodeStyleSetWidth(rootChild0Child0_child1, 50)
@@ -1000,10 +1000,10 @@ func TestPercentage_container_in_wrapping_container(t *testing.T) {
10001000
assertFloatEqual(t, 100, rootChild0Child0.LayoutGetWidth())
10011001
assertFloatEqual(t, 50, rootChild0Child0.LayoutGetHeight())
10021002

1003-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetLeft())
1004-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1005-
assertFloatEqual(t, 50, rootChild0Child0_child0.LayoutGetWidth())
1006-
assertFloatEqual(t, 50, rootChild0Child0_child0.LayoutGetHeight())
1003+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetLeft())
1004+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1005+
assertFloatEqual(t, 50, rootChild0Child0Child0.LayoutGetWidth())
1006+
assertFloatEqual(t, 50, rootChild0Child0Child0.LayoutGetHeight())
10071007

10081008
assertFloatEqual(t, 50, rootChild0Child0_child1.LayoutGetLeft())
10091009
assertFloatEqual(t, 0, rootChild0Child0_child1.LayoutGetTop())
@@ -1027,10 +1027,10 @@ func TestPercentage_container_in_wrapping_container(t *testing.T) {
10271027
assertFloatEqual(t, 100, rootChild0Child0.LayoutGetWidth())
10281028
assertFloatEqual(t, 50, rootChild0Child0.LayoutGetHeight())
10291029

1030-
assertFloatEqual(t, 50, rootChild0Child0_child0.LayoutGetLeft())
1031-
assertFloatEqual(t, 0, rootChild0Child0_child0.LayoutGetTop())
1032-
assertFloatEqual(t, 50, rootChild0Child0_child0.LayoutGetWidth())
1033-
assertFloatEqual(t, 50, rootChild0Child0_child0.LayoutGetHeight())
1030+
assertFloatEqual(t, 50, rootChild0Child0Child0.LayoutGetLeft())
1031+
assertFloatEqual(t, 0, rootChild0Child0Child0.LayoutGetTop())
1032+
assertFloatEqual(t, 50, rootChild0Child0Child0.LayoutGetWidth())
1033+
assertFloatEqual(t, 50, rootChild0Child0Child0.LayoutGetHeight())
10341034

10351035
assertFloatEqual(t, 0, rootChild0Child0_child1.LayoutGetLeft())
10361036
assertFloatEqual(t, 0, rootChild0Child0_child1.LayoutGetTop())

0 commit comments

Comments
 (0)