Skip to content

Commit 4fec38f

Browse files
ttytmttytm
authored
refactor: rename vars and params to prevent module name shadowing (#525)
1 parent 83b6cd7 commit 4fec38f

25 files changed

+109
-109
lines changed

‎src/button.v

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,8 @@ pub fn button(c ButtonParams) &Button {
148148

149149
fn (mut b Button) init(parent Layout) {
150150
b.parent = parent
151-
ui := parent.get_ui()
152-
b.ui = ui
151+
u := parent.get_ui()
152+
b.ui = u
153153
if b.use_icon {
154154
if mut b.ui.dd is DrawDeviceContext {
155155
if img := b.ui.dd.create_image(b.icon_path) {
@@ -160,7 +160,7 @@ fn (mut b Button) init(parent Layout) {
160160
b.load_style()
161161
b.set_text_size()
162162
if b.tooltip.text != '' {
163-
mut win := ui.window
163+
mut win := u.window
164164
win.tooltip.append(b, b.tooltip)
165165
}
166166
mut subscriber := parent.get_subscriber()

‎src/canvas.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ pub fn canvas(c CanvasParams) &Canvas {
5353

5454
fn (mut c Canvas) init(parent Layout) {
5555
c.parent = parent
56-
ui := parent.get_ui()
57-
c.ui = ui
56+
u := parent.get_ui()
57+
c.ui = u
5858
}
5959

6060
[manualfree]

‎src/dropdown.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ pub fn dropdown(c DropdownParams) &Dropdown {
8585

8686
pub fn (mut dd Dropdown) init(parent Layout) {
8787
dd.parent = parent
88-
ui := parent.get_ui()
89-
dd.ui = ui
88+
u := parent.get_ui()
89+
dd.ui = u
9090
dd.load_style()
9191
mut subscriber := parent.get_subscriber()
9292
subscriber.subscribe_method(events.on_click, dd_click, dd)

‎src/extra_debug.v

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,16 @@ fn debug_draw_bb_stack(s &Stack) {
2323
col)
2424
}
2525

26-
fn debug_draw_bb_widget(mut wi Widget, ui &UI) {
26+
fn debug_draw_bb_widget(mut wi Widget, u &UI) {
2727
col := gx.black
2828
w, h := wi.size()
2929
println('bb: ${wi.type_name()} (${wi.x}, ${wi.y} ,${w}, ${h})')
30-
ui.dd.draw_rect_empty(wi.x, wi.y, w, h, col)
30+
u.dd.draw_rect_empty(wi.x, wi.y, w, h, col)
3131
}
3232

33-
fn debug_draw_bb_text(x int, y int, w int, h int, ui &UI) {
33+
fn debug_draw_bb_text(x int, y int, w int, h int, u &UI) {
3434
col := gx.gray
35-
ui.dd.draw_rect_empty(x, y, w, h, col)
35+
u.dd.draw_rect_empty(x, y, w, h, col)
3636
}
3737

3838
// Debug function

‎src/extra_text.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ fn word_wrap_text_to_lines(s string, max_line_length int) []string {
3333
return word_wrapped_lines
3434
}
3535

36-
fn text_lines_size(lines []string, ui &UI) (int, int) {
36+
fn text_lines_size(lines []string, u &UI) (int, int) {
3737
mut width, mut height := 0, 0
3838
mut tw, mut th := 0, 0
39-
dd := ui.dd
39+
dd := u.dd
4040
for line in lines {
4141
tw, th = dd.text_size(line)
4242
// println("tt line: $line -> ($tw, $th)")

‎src/grid.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ pub fn grid(c GridParams) &Grid {
4747

4848
fn (mut gv Grid) init(parent Layout) {
4949
gv.parent = parent
50-
ui := parent.get_ui()
51-
gv.ui = ui
50+
u := parent.get_ui()
51+
gv.ui = u
5252
}
5353

5454
[manualfree]

‎src/interface_scrollable.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -471,8 +471,8 @@ pub mut:
471471

472472
fn (mut sv ScrollView) init(parent Layout) {
473473
mut widget := sv.widget
474-
ui := widget.ui // get_ui()
475-
sv.ui = ui
474+
u := widget.ui // get_ui()
475+
sv.ui = u
476476
sv.parent = parent
477477

478478
mut subscriber := parent.get_subscriber()

‎src/label.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ pub fn label(c LabelParams) &Label {
6868
}
6969

7070
fn (mut l Label) init(parent Layout) {
71-
ui := parent.get_ui()
72-
l.ui = ui
71+
u := parent.get_ui()
72+
l.ui = u
7373
l.load_style()
7474
// l.init_style()
7575
l.init_size()

‎src/layout_box.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,8 @@ pub fn box_layout(c BoxLayoutParams) &BoxLayout {
137137
// TODO: documentation
138138
pub fn (mut b BoxLayout) init(parent Layout) {
139139
b.parent = parent
140-
mut ui := parent.get_ui()
141-
b.ui = ui
140+
mut u := parent.get_ui()
141+
b.ui = u
142142
for _, mut child in b.children {
143143
// DON'T DO THAT: child.id = b.child_id[i]
144144
// println('$i) gl init child ${child.id} ')

‎src/layout_canvas.v

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -189,8 +189,8 @@ fn (mut c CanvasLayout) build(win &Window) {
189189

190190
fn (mut c CanvasLayout) init(parent Layout) {
191191
c.parent = parent
192-
ui := parent.get_ui()
193-
c.ui = ui
192+
u := parent.get_ui()
193+
c.ui = u
194194
c.init_size()
195195
// IMPORTANT: Subscriber needs here to be before initialization of all its children
196196
mut subscriber := parent.get_subscriber()
@@ -222,7 +222,7 @@ fn (mut c CanvasLayout) init(parent Layout) {
222222
}
223223
c.load_style()
224224

225-
c.set_adjusted_size(ui)
225+
c.set_adjusted_size(u)
226226
c.set_children_pos()
227227
c.set_root_layout()
228228

‎src/layout_group.v

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ pub fn group(c GroupParams) &Group {
7070

7171
fn (mut g Group) init(parent Layout) {
7272
g.parent = parent
73-
ui := parent.get_ui()
74-
g.ui = ui
73+
u := parent.get_ui()
74+
g.ui = u
7575
g.decode_size()
7676
for mut child in g.children {
7777
child.init(g)
@@ -201,7 +201,7 @@ fn (g &Group) get_subscriber() &eventbus.Subscriber {
201201
return parent.get_subscriber()
202202
}
203203

204-
fn (mut g Group) set_adjusted_size(i int, ui &UI) {
204+
fn (mut g Group) set_adjusted_size(i int, u &UI) {
205205
mut h, mut w := 0, 0
206206
for mut child in g.children {
207207
mut child_width, mut child_height := child.size()

‎src/listbox.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,8 @@ pub fn listbox(c ListBoxParams) &ListBox {
136136

137137
fn (mut lb ListBox) init(parent Layout) {
138138
lb.parent = parent
139-
ui := parent.get_ui()
140-
lb.ui = ui
139+
u := parent.get_ui()
140+
lb.ui = u
141141
lb.init_style()
142142
mut dtw := DrawTextWidget(lb)
143143
dtw.load_style()

‎src/menu.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ fn (mut m Menu) build(mut win Window) {
120120

121121
fn (mut m Menu) init(parent Layout) {
122122
m.parent = parent
123-
ui := parent.get_ui()
124-
m.ui = ui
123+
u := parent.get_ui()
124+
m.ui = u
125125
m.update_size()
126126
if m.is_root_menu() {
127127
m.propagate_connection()

‎src/picture.v

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -73,32 +73,32 @@ pub fn picture(c PictureParams) &Picture {
7373

7474
fn (mut pic Picture) init(parent Layout) {
7575
pic.parent = parent
76-
mut ui := parent.get_ui()
77-
pic.ui = ui
76+
mut u := parent.get_ui()
77+
pic.ui = u
7878
mut subscriber := parent.get_subscriber()
7979
subscriber.subscribe_method(events.on_click, pic_click, pic)
8080
subscriber.subscribe_method(events.on_mouse_down, pic_mouse_down, pic)
8181
pic.ui.window.evt_mngr.add_receiver(pic, [events.on_mouse_down])
8282
/*
8383
if pic.image.width > 0 {
8484
// .image was set by the user, skip path TODO
85-
ui.resource_cache[pic.path] = pic.image
85+
u.resource_cache[pic.path] = pic.image
8686
return
8787
}
8888
*/
89-
if ui.has_img(pic.path) {
90-
pic.image = ui.img(pic.path)
89+
if u.has_img(pic.path) {
90+
pic.image = u.img(pic.path)
9191
} else {
9292
if !os.exists(pic.path) {
9393
eprintln('V UI: picture file "${pic.path}" not found')
9494
}
95-
if !pic.use_cache && pic.path in ui.resource_cache {
96-
pic.image = ui.resource_cache[pic.path]
95+
if !pic.use_cache && pic.path in u.resource_cache {
96+
pic.image = u.resource_cache[pic.path]
9797
} else if mut pic.ui.dd is DrawDeviceContext {
9898
dd := pic.ui.dd
9999
if img := dd.create_image(pic.path) {
100100
pic.image = img
101-
ui.resource_cache[pic.path] = pic.image
101+
u.resource_cache[pic.path] = pic.image
102102
}
103103
}
104104
}
@@ -114,7 +114,7 @@ fn (mut pic Picture) init(parent Layout) {
114114
pic.height = pic.image.height
115115
}
116116
if pic.tooltip.text != '' {
117-
mut win := ui.window
117+
mut win := u.window
118118
win.tooltip.append(pic, pic.tooltip)
119119
}
120120
}

‎src/progressbar.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ pub fn progressbar(c ProgressBarParams) &ProgressBar {
5959

6060
fn (mut pb ProgressBar) init(parent Layout) {
6161
pb.parent = parent
62-
ui := parent.get_ui()
63-
pb.ui = ui
62+
u := parent.get_ui()
63+
pb.ui = u
6464
pb.load_style()
6565
}
6666

‎src/radio.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ pub fn radio(c RadioParams) &Radio {
104104

105105
fn (mut r Radio) init(parent Layout) {
106106
r.parent = parent
107-
ui := parent.get_ui()
108-
r.ui = ui
107+
u := parent.get_ui()
108+
r.ui = u
109109
// Get max value text width
110110
if r.width == 0 {
111111
r.set_size_from_values()

‎src/rectangle.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ pub fn spacing(c RectangleParams) &Rectangle {
8989

9090
fn (mut r Rectangle) init(parent Layout) {
9191
r.parent = parent
92-
ui := parent.get_ui()
93-
r.ui = ui
92+
u := parent.get_ui()
93+
r.ui = u
9494
// r.init_style()
9595
r.load_style()
9696
}

‎src/slider.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ pub fn slider(c SliderParams) &Slider {
110110

111111
fn (mut s Slider) init(parent Layout) {
112112
s.parent = parent
113-
ui := parent.get_ui()
114-
s.ui = ui
113+
u := parent.get_ui()
114+
s.ui = u
115115
s.load_style()
116116
mut subscriber := parent.get_subscriber()
117117
subscriber.subscribe_method(events.on_click, slider_click, s)

‎src/stack.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,8 @@ fn (mut s Stack) build(win &Window) {
177177

178178
pub fn (mut s Stack) init(parent Layout) {
179179
s.parent = parent
180-
mut ui := parent.get_ui()
181-
s.ui = ui
180+
u := parent.get_ui()
181+
s.ui = u
182182
s.init_size()
183183
s.load_style()
184184
// Init all children recursively

‎src/subwindow.v

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ pub fn (mut s SubWindow) cleanup() {
9898
subscriber.unsubscribe_method(events.on_mouse_down, s)
9999
subscriber.unsubscribe_method(events.on_mouse_move, s)
100100
subscriber.unsubscribe_method(events.on_mouse_up, s)
101-
mut ui := s.get_ui()
102-
ui.window.evt_mngr.rm_receiver(s, [events.on_mouse_down])
101+
mut u := s.get_ui()
102+
u.window.evt_mngr.rm_receiver(s, [events.on_mouse_down])
103103
unsafe { s.free() }
104104
}
105105

@@ -247,7 +247,7 @@ pub fn (mut s SubWindow) update_layout() {
247247
s.layout.update_layout()
248248
}
249249

250-
fn (mut s SubWindow) set_adjusted_size(ui &UI) {
250+
fn (mut s SubWindow) set_adjusted_size(u &UI) {
251251
}
252252

253253
fn (mut s SubWindow) point_inside_bar(x f64, y f64) bool {

‎src/switch.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@ pub fn switcher(c SwitchParams) &Switch {
6666

6767
fn (mut s Switch) init(parent Layout) {
6868
s.parent = parent
69-
ui := parent.get_ui()
70-
s.ui = ui
69+
u := parent.get_ui()
70+
s.ui = u
7171
mut subscriber := parent.get_subscriber()
7272
subscriber.subscribe_method(events.on_key_down, sw_key_down, s)
7373
subscriber.subscribe_method(events.on_click, sw_click, s)

‎src/textbox.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,8 +219,8 @@ pub fn textbox(c TextBoxParams) &TextBox {
219219

220220
pub fn (mut tb TextBox) init(parent Layout) {
221221
tb.parent = parent
222-
ui := parent.get_ui()
223-
tb.ui = ui
222+
u := parent.get_ui()
223+
tb.ui = u
224224
// tb.init_style()
225225
tb.load_style()
226226
// TODO: Maybe in a method later to allow font size update

‎src/tool_text_style.v

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,23 +64,23 @@ mut:
6464
hash map[string]int
6565
}
6666

67-
pub fn (mut ui UI) add_font(font_name string, font_path string) {
67+
pub fn (mut u UI) add_font(font_name string, font_path string) {
6868
$if fontset ? {
6969
println('add font ${font_name} at ${font_path}')
7070
}
71-
if mut ui.dd is DrawDeviceContext {
71+
if mut u.dd is DrawDeviceContext {
7272
// IMPORTANT: This fix issue that makes DrawTextFont not working for fontstash
7373
// (in fons__getGlyph, added becomes 0)
74-
ui.dd.ft.fons.reset_atlas(512, 512)
74+
u.dd.ft.fons.reset_atlas(512, 512)
7575

7676
bytes := os.read_bytes(font_path) or { []u8{} }
77-
// gg := ui.gg
78-
// mut f := ui.fonts
77+
// gg := u.gg
78+
// mut f := u.fonts
7979
if bytes.len > 0 {
80-
font_ := ui.dd.ft.fons.add_font_mem('sans', bytes, false)
80+
font_ := u.dd.ft.fons.add_font_mem('sans', bytes, false)
8181
if font_ >= 0 {
82-
ui.font_paths[font_name] = font_path
83-
ui.fonts.hash[font_name] = font_
82+
u.font_paths[font_name] = font_path
83+
u.fonts.hash[font_name] = font_
8484
$if fontset ? {
8585
println('font ${font_} ${font_name} added (${font_path})')
8686
}
@@ -100,12 +100,12 @@ pub fn (mut ui UI) add_font(font_name string, font_path string) {
100100
}
101101
}
102102
$if fontset ? {
103-
println('${ui.fonts}')
103+
println('${u.fonts}')
104104
}
105105
}
106106

107107
// define style to be used with drawtext method
108-
pub fn (mut ui UI) add_style(ts TextStyle) {
108+
pub fn (mut u UI) add_style(ts TextStyle) {
109109
mut id := ts.id
110110
if id == '' {
111111
if ts.font_name == '' {
@@ -114,7 +114,7 @@ pub fn (mut ui UI) add_style(ts TextStyle) {
114114
}
115115
id = ts.font_name
116116
}
117-
ui.text_styles[id] = TextStyle{
117+
u.text_styles[id] = TextStyle{
118118
id: id
119119
font_name: ts.font_name
120120
color: ts.color

‎src/transition.v

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ pub fn transition(c TransitionParams) &Transition {
5555

5656
fn (mut t Transition) init(parent Layout) {
5757
t.parent = parent
58-
ui := parent.get_ui()
59-
t.ui = ui
58+
u := parent.get_ui()
59+
t.ui = u
6060
}
6161

6262
[manualfree]

0 commit comments

Comments
 (0)