@@ -157,13 +157,26 @@ fn create_img_button(mut win ui.Window, path string, x int, y int, w int, h int)
157
157
return pen_btn
158
158
}
159
159
160
+ fn create_img_button_ (mut win ui.Window, img_data []u8 , x int , y int , w int , h int ) & ui.Image {
161
+ mut pen_btn := ui.image_from_byte_array_with_size (mut win, img_data, 32 , 32 )
162
+ pen_btn.z_index = 8
163
+
164
+ if x != 0 {
165
+ pen_btn.set_bounds (x, y, w, h)
166
+ }
167
+ return pen_btn
168
+ }
169
+
160
170
fn setup_brush_choices (mut win ui.Window) {
161
171
mut hbox := ui.hbox (win)
162
172
hbox.set_bounds (16 , 32 , 40 * 3 , 23 )
163
173
hbox.z_index = 7
164
174
165
- mut pencil_btn := create_img_button (mut win, 'icons8-pencil-drawing-48.png' , 0 , 0 ,
166
- 0 , 0 )
175
+ embed_pencil := $embed_file ('resources/icons8-pencil-drawing-48.png' )
176
+ embed_pen := $embed_file ('resources/icons8-pen-48.png' )
177
+ embed_spray := $embed_file ('resources/icons8-paint-sprayer-48.png' )
178
+
179
+ mut pencil_btn := create_img_button_ (mut win, embed_pencil.to_bytes (), 0 , 0 , 0 , 0 )
167
180
pencil_btn.draw_event_fn = fn (mut win ui.Window, com & ui.Component) {
168
181
if com.is_mouse_rele {
169
182
mut this := * com
@@ -178,7 +191,7 @@ fn setup_brush_choices(mut win ui.Window) {
178
191
}
179
192
hbox.add_child (pencil_btn)
180
193
181
- mut pen_btn := create_img_button (mut win, 'icons8-pen-48.png' , 0 , 0 , 0 , 0 )
194
+ mut pen_btn := create_img_button_ (mut win, embed_pen. to_bytes () , 0 , 0 , 0 , 0 )
182
195
pen_btn.draw_event_fn = fn (mut win ui.Window, com & ui.Component) {
183
196
if com.is_mouse_rele {
184
197
mut this := * com
@@ -189,8 +202,7 @@ fn setup_brush_choices(mut win ui.Window) {
189
202
}
190
203
hbox.add_child (pen_btn)
191
204
192
- mut spray_btn := create_img_button (mut win, 'icons8-paint-sprayer-48.png' , 0 , 0 , 0 ,
193
- 0 )
205
+ mut spray_btn := create_img_button_ (mut win, embed_spray.to_bytes (), 0 , 0 , 0 , 0 )
194
206
spray_btn.draw_event_fn = fn (mut win ui.Window, com & ui.Component) {
195
207
if com.is_mouse_rele {
196
208
mut this := * com
@@ -221,8 +233,9 @@ fn make_toolbar(mut win ui.Window) {
221
233
222
234
setup_brush_choices (mut win)
223
235
224
- mut picker_btn := create_img_button (mut win, 'icons8-color-wheel-2-48.png' , 1 , 22 ,
225
- 48 , 48 )
236
+ embed_picker := $embed_file ('resources/icons8-color-wheel-2-48.png' )
237
+ mut picker_btn := create_img_button_ (mut win, embed_picker.to_bytes (), 1 , 22 , 48 ,
238
+ 48 )
226
239
picker_btn.set_id (mut win, 'picker_btn' )
227
240
picker_btn.draw_event_fn = fn (mut win ui.Window, com & ui.Component) {
228
241
if com.is_mouse_rele {
@@ -239,7 +252,7 @@ fn make_toolbar(mut win ui.Window) {
239
252
mut picker_btn := & ui.Image (win.get_from_id ('picker_btn' ))
240
253
size := gg.window_size ()
241
254
242
- picker_btn.x = size.width - picker_btn.width // - 23
255
+ picker_btn.x = size.width - picker_btn.width
243
256
244
257
com.x = 0
245
258
com.y = 25
0 commit comments