Skip to content

Commit e2c2d22

Browse files
djoweldjowel
committed
Renaming xxx_margin to margin_xxx
1 parent 616aa79 commit e2c2d22

File tree

15 files changed

+159
-103
lines changed

15 files changed

+159
-103
lines changed

‎examples/buttons/main.cpp

+23-23
Original file line numberDiff line numberDiff line change
@@ -169,17 +169,17 @@ auto make_buttons(view& view_)
169169
return
170170
margin({20, 0, 20, 20},
171171
vtile(
172-
top_margin(20, mbutton),
173-
top_margin(20, tbutton),
174-
top_margin(20, hold(lbutton)),
175-
top_margin(20, hold(reset)),
176-
top_margin(20, note),
177-
top_margin(20, htile(
178-
right_margin(3, valign(0.5, prog_advance)),
172+
margin_top(20, mbutton),
173+
margin_top(20, tbutton),
174+
margin_top(20, hold(lbutton)),
175+
margin_top(20, hold(reset)),
176+
margin_top(20, note),
177+
margin_top(20, htile(
178+
margin_right(3, valign(0.5, prog_advance)),
179179
vsize(27, hold(prog_bar))
180180
)),
181-
top_margin(20, disabled_button),
182-
top_margin(20,
181+
margin_top(20, disabled_button),
182+
margin_top(20,
183183
htile(
184184
label("Enabled"),
185185
hspace(10),
@@ -190,8 +190,8 @@ auto make_buttons(view& view_)
190190
label("Disabled")
191191
)
192192
),
193-
top_margin(20, htile(left, center, right)),
194-
top_margin(20, custom)
193+
margin_top(20, htile(left, center, right)),
194+
margin_top(20, custom)
195195
)
196196
);
197197
}
@@ -211,12 +211,12 @@ auto make_controls(view& view_)
211211
auto check_boxes =
212212
group("Check boxes",
213213
margin({10, 10, 20, 20},
214-
top_margin(25,
214+
margin_top(25,
215215
vtile(
216-
top_margin(10, align_left(check_box1)),
217-
top_margin(10, align_left(check_box2)),
218-
top_margin(10, align_left(check_box3)),
219-
top_margin(10, align_left(check_box4))
216+
margin_top(10, align_left(check_box1)),
217+
margin_top(10, align_left(check_box2)),
218+
margin_top(10, align_left(check_box3)),
219+
margin_top(10, align_left(check_box4))
220220
)
221221
)
222222
)
@@ -233,12 +233,12 @@ auto make_controls(view& view_)
233233
auto radio_buttons =
234234
group("Radio Buttons",
235235
margin({10, 10, 20, 20},
236-
top_margin(25,
236+
margin_top(25,
237237
vtile(
238-
top_margin(10, align_left(radio_button1)),
239-
top_margin(10, align_left(radio_button2)),
240-
top_margin(10, align_left(radio_button3)),
241-
top_margin(10, align_left(radio_button4))
238+
margin_top(10, align_left(radio_button1)),
239+
margin_top(10, align_left(radio_button2)),
240+
margin_top(10, align_left(radio_button3)),
241+
margin_top(10, align_left(radio_button4))
242242
)
243243
)
244244
)
@@ -253,7 +253,7 @@ auto make_controls(view& view_)
253253
group("Icon Buttons",
254254
margin({10, 10, 20, 10},
255255
vtile(
256-
top_margin(35,
256+
margin_top(35,
257257
htile(
258258
align_center(toggle_icon_button(icons::power, 1.2, indicator_color)),
259259
align_center(icon_button(icons::magnifying_glass, 1.2)),
@@ -276,7 +276,7 @@ auto make_controls(view& view_)
276276
group("Sprite Buttons",
277277
margin({10, 10, 20, 10},
278278
vtile(
279-
top_margin(35,
279+
margin_top(35,
280280
htile(
281281
align_center(toggle_button(power_button)),
282282
align_center(toggle_button(phase_button)),

‎examples/dialogs/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ auto dialog_content()
2727
hsize(300, simple_heading(
2828
margin({10, 10, 10, 10},
2929
vtile(
30-
top_margin(10, align_left(check_box1)),
31-
top_margin(10, align_left(check_box2)),
32-
top_margin(10, align_left(check_box3))
30+
margin_top(10, align_left(check_box1)),
31+
margin_top(10, align_left(check_box2)),
32+
margin_top(10, align_left(check_box3))
3333
)
3434
),
3535
"The Thraxian Legacy",

‎examples/layout/main.cpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ auto rbox_ = rbox(colors::gold.opacity(0.8));
1616

1717
auto make_vtile_aligns()
1818
{
19-
auto _box = top_margin(
19+
auto _box = margin_top(
2020
{10},
2121
hsize(150, rbox_)
2222
);
@@ -38,7 +38,7 @@ auto make_vtile_aligns()
3838

3939
auto make_vtile_stretch()
4040
{
41-
auto _box = top_margin(
41+
auto _box = margin_top(
4242
{10},
4343
rbox_
4444
);
@@ -59,12 +59,12 @@ auto make_vtile_stretch()
5959

6060
auto make_vtile_mixed()
6161
{
62-
auto _box = top_margin(
62+
auto _box = margin_top(
6363
{10},
6464
rbox_
6565
);
6666

67-
auto _box2 = top_margin(
67+
auto _box2 = margin_top(
6868
{10},
6969
hsize(150, rbox_)
7070
);
@@ -85,7 +85,7 @@ auto make_vtile_mixed()
8585

8686
auto make_htile_aligns()
8787
{
88-
auto _box = left_margin(
88+
auto _box = margin_left(
8989
{10},
9090
vsize(150, rbox_)
9191
);
@@ -105,7 +105,7 @@ auto make_htile_aligns()
105105

106106
auto make_htile_stretch()
107107
{
108-
auto _box = left_margin(
108+
auto _box = margin_left(
109109
{10},
110110
rbox_
111111
);
@@ -124,12 +124,12 @@ auto make_htile_stretch()
124124

125125
auto make_htile_mixed()
126126
{
127-
auto _box = left_margin(
127+
auto _box = margin_left(
128128
{10},
129129
rbox_
130130
);
131131

132-
auto _box2 = left_margin(
132+
auto _box2 = margin_left(
133133
{10},
134134
vsize(150, rbox_)
135135
);
@@ -241,7 +241,7 @@ auto make_hvgrid()
241241
};
242242

243243
return
244-
top_margin(50, vgrid(
244+
margin_top(50, vgrid(
245245
vgrid_coords,
246246
make_hgrid1(),
247247
make_hgrid2(),
@@ -308,7 +308,7 @@ auto make_fixed_hvgrid()
308308
};
309309

310310
return
311-
top_margin(50, vgrid(
311+
margin_top(50, vgrid(
312312
make_hgrid1(),
313313
make_hgrid2(),
314314
make_hgrid1(),

‎examples/menus/main.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,10 @@ auto make_menus(view& view_)
148148
margin({20, 0, 20, 20},
149149
vtile(
150150
hmin_size(300, make_selection_menu()),
151-
top_margin(20, make_popup_menu("Dropdown Menu", menu_position::bottom_right)),
152-
top_margin(20, make_dynamic_menu("Dynamic Menu", menu_position::bottom_right)),
153-
top_margin(20, scroller(image{"deep_space.jpg"})),
154-
top_margin(20, make_popup_menu("Dropup Menu", menu_position::top_right))
151+
margin_top(20, make_popup_menu("Dropdown Menu", menu_position::bottom_right)),
152+
margin_top(20, make_dynamic_menu("Dynamic Menu", menu_position::bottom_right)),
153+
margin_top(20, scroller(image{"deep_space.jpg"})),
154+
margin_top(20, make_popup_menu("Dropup Menu", menu_position::top_right))
155155
)
156156
);
157157
}

‎examples/scale/main.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ auto make_column()
2727
auto group0 =
2828
group("Text Boxes",
2929
margin({10, 10, 20, 20},
30-
top_margin(35,
30+
margin_top(35,
3131
vtile(
3232
left_caption(input_box("Show me the money").first, "Gimme Some"),
33-
top_margin(10, left_caption(input_box("Show me more").first, "Gimme Some More"))
33+
margin_top(10, left_caption(input_box("Show me more").first, "Gimme Some More"))
3434
)
3535
)
3636
)
@@ -39,11 +39,11 @@ auto make_column()
3939
auto group1 =
4040
group("Check boxes",
4141
margin({10, 10, 20, 20},
42-
top_margin(25,
42+
margin_top(25,
4343
vtile(
44-
top_margin(10, align_left(check_box1)),
45-
top_margin(10, align_left(check_box2)),
46-
top_margin(10, align_left(check_box3))
44+
margin_top(10, align_left(check_box1)),
45+
margin_top(10, align_left(check_box2)),
46+
margin_top(10, align_left(check_box3))
4747
)
4848
)
4949
)
@@ -60,7 +60,7 @@ auto make_column()
6060
auto group2 =
6161
group("Buttons",
6262
margin({10, 10, 20, 10},
63-
top_margin(35,
63+
margin_top(35,
6464
vtile(
6565
htile(
6666
align_center(toggle_icon_button(icons::power, 1.2, indicator_color)),

‎examples/sprite_sliders_and_knobs/main.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ auto make_vslider(int index)
4545
auto make_vsliders()
4646
{
4747
return hmin_size(250,
48-
right_margin(10, htile(
48+
margin_right(10, htile(
4949
make_vslider(0),
5050
make_vslider(1),
5151
make_vslider(2)

‎examples/text_and_icons/main.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ auto make_basic_text()
8888

8989
auto my_label = [=](auto text)
9090
{
91-
return right_margin(10, label(text).text_align(canvas::right));
91+
return margin_right(10, label(text).text_align(canvas::right));
9292
};
9393

9494
auto my_input = [=](auto caption, auto input)
9595
{
96-
return bottom_margin(10, hgrid(grid, my_label(caption), input));
96+
return margin_bottom(10, hgrid(grid, my_label(caption), input));
9797
};
9898

9999
// This is an example on how to add an on_text callback:
@@ -117,16 +117,16 @@ auto make_basic_text()
117117
my_input("Cute Text Boxes",
118118
htile(
119119
input_box(0.7).first,
120-
left_margin(10, input_box(0.7).first),
121-
left_margin(10, input_box(0.7).first)
120+
margin_left(10, input_box(0.7).first),
121+
margin_left(10, input_box(0.7).first)
122122
)
123123
)
124124
)
125125
))
126126
;
127127

128128
auto labels =
129-
top_margin(20, pane("Labels",
129+
margin_top(20, pane("Labels",
130130
vtile(
131131
el(label("Hello, Universe. This is Elements.")
132132
.font(font_descr{"Open Sans"}.semi_bold())
@@ -154,7 +154,7 @@ auto make_basic_text()
154154
vtile(
155155
text_input,
156156
labels,
157-
top_margin(20, pane("Icons", std::move(icons))),
157+
margin_top(20, pane("Icons", std::move(icons))),
158158
empty()
159159
)
160160
);

‎examples/thumbwheels/main.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ auto make_thumbwheel1()
4040

4141
auto tw = share(vthumbwheel(20, compose));
4242

43-
return top_margin(20,
43+
return margin_top(20,
4444
layer(
4545
hold(tw),
4646
frame{}
@@ -63,7 +63,7 @@ auto make_thumbwheel2(char const* unit, float offset, float scale, int precision
6363

6464
auto tw = share(thumbwheel(as_label<double>(as_string, label)));
6565

66-
return top_margin(20,
66+
return margin_top(20,
6767
layer(
6868
hold(tw),
6969
frame{}
@@ -88,7 +88,7 @@ auto make_xy_thumbwheel()
8888
auto tw = share(thumbwheel(fixed_size({170, 36}, draw_value<point>(draw))));
8989
tw->value({0.25f, 0.25f});
9090

91-
return top_margin(20, hold(tw));
91+
return margin_top(20, hold(tw));
9292
}
9393

9494
int main(int argc, char* argv[])

‎examples/tooltip/main.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ auto make_buttons(view& view_)
5353
return
5454
margin({50, 20, 50, 40},
5555
vtile(
56-
align_center(top_margin(20, hold(status))),
57-
top_margin(20, button1),
58-
top_margin(20, button2),
59-
top_margin(20, button3),
60-
top_margin(20, button4)
56+
align_center(margin_top(20, hold(status))),
57+
margin_top(20, button1),
58+
margin_top(20, button2),
59+
margin_top(20, button3),
60+
margin_top(20, button4)
6161
)
6262
);
6363
}

0 commit comments

Comments
 (0)