Skip to content

Commit f6dd7c7

Browse files
committed
more renames
1 parent 6fc870b commit f6dd7c7

9 files changed

+55
-55
lines changed

align_content_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -207,13 +207,13 @@ func TestAlign_content_flex_start_with_flex(t *testing.T) {
207207

208208
rootChild0 := NewNodeWithConfig(config)
209209
NodeStyleSetFlexGrow(rootChild0, 1)
210-
NodeStyleSetFlexBasisPercent(rootChild0, 0)
210+
rootChild0.StyleSetFlexBasisPercent(0)
211211
NodeStyleSetWidth(rootChild0, 50)
212212
NodeInsertChild(root, rootChild0, 0)
213213

214214
rootChild1 := NewNodeWithConfig(config)
215215
NodeStyleSetFlexGrow(rootChild1, 1)
216-
NodeStyleSetFlexBasisPercent(rootChild1, 0)
216+
rootChild1.StyleSetFlexBasisPercent(0)
217217
NodeStyleSetWidth(rootChild1, 50)
218218
NodeStyleSetHeight(rootChild1, 10)
219219
NodeInsertChild(root, rootChild1, 1)
@@ -225,7 +225,7 @@ func TestAlign_content_flex_start_with_flex(t *testing.T) {
225225
rootChild3 := NewNodeWithConfig(config)
226226
NodeStyleSetFlexGrow(rootChild3, 1)
227227
NodeStyleSetFlexShrink(rootChild3, 1)
228-
NodeStyleSetFlexBasisPercent(rootChild3, 0)
228+
rootChild3.StyleSetFlexBasisPercent(0)
229229
NodeStyleSetWidth(rootChild3, 50)
230230
NodeInsertChild(root, rootChild3, 3)
231231

@@ -799,7 +799,7 @@ func TestAlign_content_stretch_row_with_children(t *testing.T) {
799799
rootChild0Child0 := NewNodeWithConfig(config)
800800
NodeStyleSetFlexGrow(rootChild0Child0, 1)
801801
NodeStyleSetFlexShrink(rootChild0Child0, 1)
802-
NodeStyleSetFlexBasisPercent(rootChild0Child0, 0)
802+
rootChild0Child0.StyleSetFlexBasisPercent(0)
803803
NodeInsertChild(rootChild0, rootChild0Child0, 0)
804804

805805
rootChild1 := NewNodeWithConfig(config)
@@ -909,7 +909,7 @@ func TestAlign_content_stretch_row_with_flex(t *testing.T) {
909909
rootChild1 := NewNodeWithConfig(config)
910910
NodeStyleSetFlexGrow(rootChild1, 1)
911911
NodeStyleSetFlexShrink(rootChild1, 1)
912-
NodeStyleSetFlexBasisPercent(rootChild1, 0)
912+
rootChild1.StyleSetFlexBasisPercent(0)
913913
NodeStyleSetWidth(rootChild1, 50)
914914
NodeInsertChild(root, rootChild1, 1)
915915

@@ -920,7 +920,7 @@ func TestAlign_content_stretch_row_with_flex(t *testing.T) {
920920
rootChild3 := NewNodeWithConfig(config)
921921
NodeStyleSetFlexGrow(rootChild3, 1)
922922
NodeStyleSetFlexShrink(rootChild3, 1)
923-
NodeStyleSetFlexBasisPercent(rootChild3, 0)
923+
rootChild3.StyleSetFlexBasisPercent(0)
924924
NodeStyleSetWidth(rootChild3, 50)
925925
NodeInsertChild(root, rootChild3, 3)
926926

@@ -1009,7 +1009,7 @@ func TestAlign_content_stretch_row_with_flex_no_shrink(t *testing.T) {
10091009
rootChild1 := NewNodeWithConfig(config)
10101010
NodeStyleSetFlexGrow(rootChild1, 1)
10111011
NodeStyleSetFlexShrink(rootChild1, 1)
1012-
NodeStyleSetFlexBasisPercent(rootChild1, 0)
1012+
rootChild1.StyleSetFlexBasisPercent(0)
10131013
NodeStyleSetWidth(rootChild1, 50)
10141014
NodeInsertChild(root, rootChild1, 1)
10151015

@@ -1019,7 +1019,7 @@ func TestAlign_content_stretch_row_with_flex_no_shrink(t *testing.T) {
10191019

10201020
rootChild3 := NewNodeWithConfig(config)
10211021
NodeStyleSetFlexGrow(rootChild3, 1)
1022-
NodeStyleSetFlexBasisPercent(rootChild3, 0)
1022+
rootChild3.StyleSetFlexBasisPercent(0)
10231023
NodeStyleSetWidth(rootChild3, 50)
10241024
NodeInsertChild(root, rootChild3, 3)
10251025

@@ -1648,13 +1648,13 @@ func TestAlign_content_stretch_column(t *testing.T) {
16481648
rootChild0Child0 := NewNodeWithConfig(config)
16491649
NodeStyleSetFlexGrow(rootChild0Child0, 1)
16501650
NodeStyleSetFlexShrink(rootChild0Child0, 1)
1651-
NodeStyleSetFlexBasisPercent(rootChild0Child0, 0)
1651+
rootChild0Child0.StyleSetFlexBasisPercent(0)
16521652
NodeInsertChild(rootChild0, rootChild0Child0, 0)
16531653

16541654
rootChild1 := NewNodeWithConfig(config)
16551655
NodeStyleSetFlexGrow(rootChild1, 1)
16561656
NodeStyleSetFlexShrink(rootChild1, 1)
1657-
NodeStyleSetFlexBasisPercent(rootChild1, 0)
1657+
rootChild1.StyleSetFlexBasisPercent(0)
16581658
NodeStyleSetHeight(rootChild1, 50)
16591659
NodeInsertChild(root, rootChild1, 1)
16601660

compute_padding_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ func TestComputed_layout_padding(t *testing.T) {
1010

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

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

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

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

default_values_test.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -72,15 +72,15 @@ func TestAssert_default_values(t *testing.T) {
7272
assertFloatEqual(t, 0, root.LayoutGetMargin(EdgeRight))
7373
assertFloatEqual(t, 0, root.LayoutGetMargin(EdgeBottom))
7474

75-
assertFloatEqual(t, 0, NodeLayoutGetPadding(root, EdgeLeft))
76-
assertFloatEqual(t, 0, NodeLayoutGetPadding(root, EdgeTop))
77-
assertFloatEqual(t, 0, NodeLayoutGetPadding(root, EdgeRight))
78-
assertFloatEqual(t, 0, NodeLayoutGetPadding(root, EdgeBottom))
79-
80-
assertFloatEqual(t, 0, NodeLayoutGetBorder(root, EdgeLeft))
81-
assertFloatEqual(t, 0, NodeLayoutGetBorder(root, EdgeTop))
82-
assertFloatEqual(t, 0, NodeLayoutGetBorder(root, EdgeRight))
83-
assertFloatEqual(t, 0, NodeLayoutGetBorder(root, EdgeBottom))
75+
assertFloatEqual(t, 0, root.LayoutGetPadding(EdgeLeft))
76+
assertFloatEqual(t, 0, root.LayoutGetPadding(EdgeTop))
77+
assertFloatEqual(t, 0, root.LayoutGetPadding(EdgeRight))
78+
assertFloatEqual(t, 0, root.LayoutGetPadding(EdgeBottom))
79+
80+
assertFloatEqual(t, 0, root.LayoutGetBorder(EdgeLeft))
81+
assertFloatEqual(t, 0, root.LayoutGetBorder(EdgeTop))
82+
assertFloatEqual(t, 0, root.LayoutGetBorder(EdgeRight))
83+
assertFloatEqual(t, 0, root.LayoutGetBorder(EdgeBottom))
8484

8585
assert.True(t, FloatIsUndefined(root.LayoutGetWidth()))
8686
assert.True(t, FloatIsUndefined(root.LayoutGetHeight()))

display_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -172,20 +172,20 @@ func TestDisplay_none_with_child(t *testing.T) {
172172
rootChild0 := NewNodeWithConfig(config)
173173
NodeStyleSetFlexGrow(rootChild0, 1)
174174
NodeStyleSetFlexShrink(rootChild0, 1)
175-
NodeStyleSetFlexBasisPercent(rootChild0, 0)
175+
rootChild0.StyleSetFlexBasisPercent(0)
176176
NodeInsertChild(root, rootChild0, 0)
177177

178178
rootChild1 := NewNodeWithConfig(config)
179179
NodeStyleSetFlexGrow(rootChild1, 1)
180180
NodeStyleSetFlexShrink(rootChild1, 1)
181-
NodeStyleSetFlexBasisPercent(rootChild1, 0)
181+
rootChild1.StyleSetFlexBasisPercent(0)
182182
NodeStyleSetDisplay(rootChild1, DisplayNone)
183183
NodeInsertChild(root, rootChild1, 1)
184184

185185
rootChild1child0 := NewNodeWithConfig(config)
186186
NodeStyleSetFlexGrow(rootChild1child0, 1)
187187
NodeStyleSetFlexShrink(rootChild1child0, 1)
188-
NodeStyleSetFlexBasisPercent(rootChild1child0, 0)
188+
rootChild1child0.StyleSetFlexBasisPercent(0)
189189
NodeStyleSetWidth(rootChild1child0, 20)
190190
NodeStyleSetMinWidth(rootChild1child0, 0)
191191
NodeStyleSetMinHeight(rootChild1child0, 0)
@@ -194,7 +194,7 @@ func TestDisplay_none_with_child(t *testing.T) {
194194
rootChild2 := NewNodeWithConfig(config)
195195
NodeStyleSetFlexGrow(rootChild2, 1)
196196
NodeStyleSetFlexShrink(rootChild2, 1)
197-
NodeStyleSetFlexBasisPercent(rootChild2, 0)
197+
rootChild2.StyleSetFlexBasisPercent(0)
198198
NodeInsertChild(root, rootChild2, 2)
199199
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
200200

flex_wrap_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1393,7 +1393,7 @@ func TestWrapped_column_max_height_flex(t *testing.T) {
13931393
rootChild0 := NewNodeWithConfig(config)
13941394
NodeStyleSetFlexGrow(rootChild0, 1)
13951395
NodeStyleSetFlexShrink(rootChild0, 1)
1396-
NodeStyleSetFlexBasisPercent(rootChild0, 0)
1396+
rootChild0.StyleSetFlexBasisPercent(0)
13971397
NodeStyleSetWidth(rootChild0, 100)
13981398
NodeStyleSetHeight(rootChild0, 500)
13991399
NodeStyleSetMaxHeight(rootChild0, 200)
@@ -1402,7 +1402,7 @@ func TestWrapped_column_max_height_flex(t *testing.T) {
14021402
rootChild1 := NewNodeWithConfig(config)
14031403
NodeStyleSetFlexGrow(rootChild1, 1)
14041404
NodeStyleSetFlexShrink(rootChild1, 1)
1405-
NodeStyleSetFlexBasisPercent(rootChild1, 0)
1405+
rootChild1.StyleSetFlexBasisPercent(0)
14061406
NodeStyleSetMargin(rootChild1, EdgeLeft, 20)
14071407
NodeStyleSetMargin(rootChild1, EdgeTop, 20)
14081408
NodeStyleSetMargin(rootChild1, EdgeRight, 20)

min_max_dimension_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ func TestChild_min_max_width_flexing(t *testing.T) {
10431043

10441044
rootChild1 := NewNodeWithConfig(config)
10451045
NodeStyleSetFlexGrow(rootChild1, 1)
1046-
NodeStyleSetFlexBasisPercent(rootChild1, 50)
1046+
rootChild1.StyleSetFlexBasisPercent(50)
10471047
NodeStyleSetMaxWidth(rootChild1, 20)
10481048
NodeInsertChild(root, rootChild1, 1)
10491049
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)

percentage_test.go

+18-18
Original file line numberDiff line numberDiff line change
@@ -127,12 +127,12 @@ func TestPercentage_flex_basis(t *testing.T) {
127127

128128
rootChild0 := NewNodeWithConfig(config)
129129
NodeStyleSetFlexGrow(rootChild0, 1)
130-
NodeStyleSetFlexBasisPercent(rootChild0, 50)
130+
rootChild0.StyleSetFlexBasisPercent(50)
131131
NodeInsertChild(root, rootChild0, 0)
132132

133133
rootChild1 := NewNodeWithConfig(config)
134134
NodeStyleSetFlexGrow(rootChild1, 1)
135-
NodeStyleSetFlexBasisPercent(rootChild1, 25)
135+
rootChild1.StyleSetFlexBasisPercent(25)
136136
NodeInsertChild(root, rootChild1, 1)
137137
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
138138

@@ -178,12 +178,12 @@ func TestPercentage_flex_basis_cross(t *testing.T) {
178178

179179
rootChild0 := NewNodeWithConfig(config)
180180
NodeStyleSetFlexGrow(rootChild0, 1)
181-
NodeStyleSetFlexBasisPercent(rootChild0, 50)
181+
rootChild0.StyleSetFlexBasisPercent(50)
182182
NodeInsertChild(root, rootChild0, 0)
183183

184184
rootChild1 := NewNodeWithConfig(config)
185185
NodeStyleSetFlexGrow(rootChild1, 1)
186-
NodeStyleSetFlexBasisPercent(rootChild1, 25)
186+
rootChild1.StyleSetFlexBasisPercent(25)
187187
NodeInsertChild(root, rootChild1, 1)
188188
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
189189

@@ -281,13 +281,13 @@ func TestPercentage_flex_basis_main_max_height(t *testing.T) {
281281

282282
rootChild0 := NewNodeWithConfig(config)
283283
NodeStyleSetFlexGrow(rootChild0, 1)
284-
NodeStyleSetFlexBasisPercent(rootChild0, 10)
284+
rootChild0.StyleSetFlexBasisPercent(10)
285285
NodeStyleSetMaxHeightPercent(rootChild0, 60)
286286
NodeInsertChild(root, rootChild0, 0)
287287

288288
rootChild1 := NewNodeWithConfig(config)
289289
NodeStyleSetFlexGrow(rootChild1, 4)
290-
NodeStyleSetFlexBasisPercent(rootChild1, 10)
290+
rootChild1.StyleSetFlexBasisPercent(10)
291291
NodeStyleSetMaxHeightPercent(rootChild1, 20)
292292
NodeInsertChild(root, rootChild1, 1)
293293
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
@@ -334,13 +334,13 @@ func TestPercentage_flex_basis_cross_max_height(t *testing.T) {
334334

335335
rootChild0 := NewNodeWithConfig(config)
336336
NodeStyleSetFlexGrow(rootChild0, 1)
337-
NodeStyleSetFlexBasisPercent(rootChild0, 10)
337+
rootChild0.StyleSetFlexBasisPercent(10)
338338
NodeStyleSetMaxHeightPercent(rootChild0, 60)
339339
NodeInsertChild(root, rootChild0, 0)
340340

341341
rootChild1 := NewNodeWithConfig(config)
342342
NodeStyleSetFlexGrow(rootChild1, 4)
343-
NodeStyleSetFlexBasisPercent(rootChild1, 10)
343+
rootChild1.StyleSetFlexBasisPercent(10)
344344
NodeStyleSetMaxHeightPercent(rootChild1, 20)
345345
NodeInsertChild(root, rootChild1, 1)
346346
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
@@ -388,13 +388,13 @@ func TestPercentage_flex_basis_main_max_width(t *testing.T) {
388388

389389
rootChild0 := NewNodeWithConfig(config)
390390
NodeStyleSetFlexGrow(rootChild0, 1)
391-
NodeStyleSetFlexBasisPercent(rootChild0, 15)
391+
rootChild0.StyleSetFlexBasisPercent(15)
392392
NodeStyleSetMaxWidthPercent(rootChild0, 60)
393393
NodeInsertChild(root, rootChild0, 0)
394394

395395
rootChild1 := NewNodeWithConfig(config)
396396
NodeStyleSetFlexGrow(rootChild1, 4)
397-
NodeStyleSetFlexBasisPercent(rootChild1, 10)
397+
rootChild1.StyleSetFlexBasisPercent(10)
398398
NodeStyleSetMaxWidthPercent(rootChild1, 20)
399399
NodeInsertChild(root, rootChild1, 1)
400400
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
@@ -441,13 +441,13 @@ func TestPercentage_flex_basis_cross_max_width(t *testing.T) {
441441

442442
rootChild0 := NewNodeWithConfig(config)
443443
NodeStyleSetFlexGrow(rootChild0, 1)
444-
NodeStyleSetFlexBasisPercent(rootChild0, 10)
444+
rootChild0.StyleSetFlexBasisPercent(10)
445445
NodeStyleSetMaxWidthPercent(rootChild0, 60)
446446
NodeInsertChild(root, rootChild0, 0)
447447

448448
rootChild1 := NewNodeWithConfig(config)
449449
NodeStyleSetFlexGrow(rootChild1, 4)
450-
NodeStyleSetFlexBasisPercent(rootChild1, 15)
450+
rootChild1.StyleSetFlexBasisPercent(15)
451451
NodeStyleSetMaxWidthPercent(rootChild1, 20)
452452
NodeInsertChild(root, rootChild1, 1)
453453
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
@@ -495,13 +495,13 @@ func TestPercentage_flex_basis_main_min_width(t *testing.T) {
495495

496496
rootChild0 := NewNodeWithConfig(config)
497497
NodeStyleSetFlexGrow(rootChild0, 1)
498-
NodeStyleSetFlexBasisPercent(rootChild0, 15)
498+
rootChild0.StyleSetFlexBasisPercent(15)
499499
NodeStyleSetMinWidthPercent(rootChild0, 60)
500500
NodeInsertChild(root, rootChild0, 0)
501501

502502
rootChild1 := NewNodeWithConfig(config)
503503
NodeStyleSetFlexGrow(rootChild1, 4)
504-
NodeStyleSetFlexBasisPercent(rootChild1, 10)
504+
rootChild1.StyleSetFlexBasisPercent(10)
505505
NodeStyleSetMinWidthPercent(rootChild1, 20)
506506
NodeInsertChild(root, rootChild1, 1)
507507
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
@@ -548,13 +548,13 @@ func TestPercentage_flex_basis_cross_min_width(t *testing.T) {
548548

549549
rootChild0 := NewNodeWithConfig(config)
550550
NodeStyleSetFlexGrow(rootChild0, 1)
551-
NodeStyleSetFlexBasisPercent(rootChild0, 10)
551+
rootChild0.StyleSetFlexBasisPercent(10)
552552
NodeStyleSetMinWidthPercent(rootChild0, 60)
553553
NodeInsertChild(root, rootChild0, 0)
554554

555555
rootChild1 := NewNodeWithConfig(config)
556556
NodeStyleSetFlexGrow(rootChild1, 4)
557-
NodeStyleSetFlexBasisPercent(rootChild1, 15)
557+
rootChild1.StyleSetFlexBasisPercent(15)
558558
NodeStyleSetMinWidthPercent(rootChild1, 20)
559559
NodeInsertChild(root, rootChild1, 1)
560560
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)
@@ -601,7 +601,7 @@ func TestPercentage_multiple_nested_with_padding_margin_and_percentage_values(t
601601

602602
rootChild0 := NewNodeWithConfig(config)
603603
NodeStyleSetFlexGrow(rootChild0, 1)
604-
NodeStyleSetFlexBasisPercent(rootChild0, 10)
604+
rootChild0.StyleSetFlexBasisPercent(10)
605605
NodeStyleSetMargin(rootChild0, EdgeLeft, 5)
606606
NodeStyleSetMargin(rootChild0, EdgeTop, 5)
607607
NodeStyleSetMargin(rootChild0, EdgeRight, 5)
@@ -639,7 +639,7 @@ func TestPercentage_multiple_nested_with_padding_margin_and_percentage_values(t
639639

640640
rootChild1 := NewNodeWithConfig(config)
641641
NodeStyleSetFlexGrow(rootChild1, 4)
642-
NodeStyleSetFlexBasisPercent(rootChild1, 15)
642+
rootChild1.StyleSetFlexBasisPercent(15)
643643
NodeStyleSetMinWidthPercent(rootChild1, 20)
644644
NodeInsertChild(root, rootChild1, 1)
645645
NodeCalculateLayout(root, Undefined, Undefined, DirectionLTR)

relayout_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ func TestDont_cache_computed_flex_basis_between_layouts(t *testing.T) {
1111
NodeStyleSetWidthPercent(root, 100)
1212

1313
rootChild0 := NewNodeWithConfig(config)
14-
NodeStyleSetFlexBasisPercent(rootChild0, 100)
14+
rootChild0.StyleSetFlexBasisPercent(100)
1515
NodeInsertChild(root, rootChild0, 0)
1616

1717
NodeCalculateLayout(root, 100, Undefined, DirectionLTR)

yoga_props.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -290,8 +290,8 @@ func NodeStyleSetFlexBasis(node *Node, flexBasis float32) {
290290
}
291291
}
292292

293-
// NodeStyleSetFlexBasisPercent sets flex basis percent
294-
func NodeStyleSetFlexBasisPercent(node *Node, flexBasis float32) {
293+
// StyleSetFlexBasisPercent sets flex basis percent
294+
func (node *Node) StyleSetFlexBasisPercent(flexBasis float32) {
295295
if node.Style.FlexBasis.Value != flexBasis ||
296296
node.Style.FlexBasis.Unit != UnitPercent {
297297
node.Style.FlexBasis.Value = flexBasis
@@ -581,8 +581,8 @@ func (node *Node) LayoutGetMargin(edge Edge) float32 {
581581
return node.Layout.Margin[edge]
582582
}
583583

584-
// NodeLayoutGetBorder gets border
585-
func NodeLayoutGetBorder(node *Node, edge Edge) float32 {
584+
// LayoutGetBorder gets border
585+
func (node *Node) LayoutGetBorder(edge Edge) float32 {
586586
assertWithNode(node, edge < EdgeEnd,
587587
"Cannot get layout properties of multi-edge shorthands")
588588
if edge == EdgeLeft {
@@ -600,8 +600,8 @@ func NodeLayoutGetBorder(node *Node, edge Edge) float32 {
600600
return node.Layout.Border[edge]
601601
}
602602

603-
// NodeLayoutGetPadding gets padding
604-
func NodeLayoutGetPadding(node *Node, edge Edge) float32 {
603+
// LayoutGetPadding gets padding
604+
func (node *Node) LayoutGetPadding(edge Edge) float32 {
605605
assertWithNode(node, edge < EdgeEnd,
606606
"Cannot get layout properties of multi-edge shorthands")
607607
if edge == EdgeLeft {

0 commit comments

Comments
 (0)