Skip to content

Commit 8e21d77

Browse files
authored
rename alignment names (#64)
* rename alignments * add more details to docstring for Alignment
1 parent b5dd501 commit 8e21d77

File tree

4 files changed

+227
-164
lines changed

4 files changed

+227
-164
lines changed

examples/example.jl

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ function start()
129129
user_input_state.cursor,
130130
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
131131
layout,
132-
SI.UP_IN_LEFT_IN,
132+
SI.UP1_LEFT1,
133133
padding,
134134
SD.get_height(font),
135135
SD.get_width(font) * SI.get_num_printable_characters(text),
136136
image,
137-
SI.UP_IN_LEFT_IN,
137+
SI.UP1_LEFT1,
138138
-1,
139139
text,
140140
font,
@@ -150,12 +150,12 @@ function start()
150150
user_input_state.cursor,
151151
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
152152
layout,
153-
SI.DOWN_OUT_LEFT_IN,
153+
SI.DOWN2_LEFT1,
154154
padding,
155155
SD.get_height(font),
156156
SD.get_width(font) * 12,
157157
image,
158-
SI.UP_IN_LEFT_IN,
158+
SI.UP1_LEFT1,
159159
-1,
160160
"Button",
161161
font,
@@ -172,7 +172,7 @@ function start()
172172
user_input_state.cursor,
173173
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
174174
layout,
175-
SI.RIGHT_OUT,
175+
SI.RIGHT2,
176176
padding,
177177
SD.get_height(font),
178178
240,
@@ -197,12 +197,12 @@ function start()
197197
user_input_state.cursor,
198198
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
199199
layout,
200-
SI.DOWN_OUT_LEFT_IN,
200+
SI.DOWN2_LEFT1,
201201
padding,
202202
SD.get_height(font),
203203
SD.get_width(font) * 12,
204204
image,
205-
SI.UP_IN_LEFT_IN,
205+
SI.UP1_LEFT1,
206206
-1,
207207
"Slider",
208208
font,
@@ -220,7 +220,7 @@ function start()
220220
user_input_state.cursor,
221221
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
222222
layout,
223-
SI.RIGHT_OUT,
223+
SI.RIGHT2,
224224
padding,
225225
SD.get_height(font),
226226
240,
@@ -243,12 +243,12 @@ function start()
243243
user_input_state.cursor,
244244
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
245245
layout,
246-
SI.DOWN_OUT_LEFT_IN,
246+
SI.DOWN2_LEFT1,
247247
padding,
248248
SD.get_height(font),
249249
SD.get_width(font) * 12,
250250
image,
251-
SI.UP_IN_LEFT_IN,
251+
SI.UP1_LEFT1,
252252
-1,
253253
"TextBox",
254254
font,
@@ -267,12 +267,12 @@ function start()
267267
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
268268
user_input_state.characters,
269269
layout,
270-
SI.RIGHT_OUT,
270+
SI.RIGHT2,
271271
padding,
272272
SD.get_height(font),
273273
240,
274274
image,
275-
SI.LEFT_IN,
275+
SI.LEFT1,
276276
-1,
277277
font,
278278
SI.ContextualColor(0x00b0b0b0, 0x00b7b7b7, 0x00bfbfbf),
@@ -298,12 +298,12 @@ function start()
298298
user_input_state.cursor,
299299
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
300300
layout,
301-
SI.DOWN_OUT_LEFT_IN,
301+
SI.DOWN2_LEFT1,
302302
padding,
303303
SD.get_height(font),
304304
SD.get_width(font) * 12,
305305
image,
306-
SI.UP_IN_LEFT_IN,
306+
SI.UP1_LEFT1,
307307
-1,
308308
"RadioButton",
309309
font,
@@ -327,12 +327,12 @@ function start()
327327
user_input_state.cursor,
328328
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
329329
layout,
330-
SI.RIGHT_OUT,
330+
SI.RIGHT2,
331331
padding,
332332
SD.get_height(font),
333333
SD.get_width(font) * (max_num_chars + 2),
334334
image,
335-
SI.LEFT_IN,
335+
SI.LEFT1,
336336
-1,
337337
item,
338338
font,
@@ -354,12 +354,12 @@ function start()
354354
user_input_state.cursor,
355355
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
356356
layout,
357-
SI.DOWN_OUT_LEFT_IN,
357+
SI.DOWN2_LEFT1,
358358
padding,
359359
SD.get_height(font),
360360
SD.get_width(font) * 12,
361361
image,
362-
SI.UP_IN_LEFT_IN,
362+
SI.UP1_LEFT1,
363363
-1,
364364
"DropDown",
365365
font,
@@ -382,12 +382,12 @@ function start()
382382
user_input_state.cursor,
383383
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
384384
layout,
385-
SI.RIGHT_OUT,
385+
SI.RIGHT2,
386386
padding,
387387
SD.get_height(font),
388388
SD.get_width(font) * (max_num_chars + 2),
389389
image,
390-
SI.LEFT_IN,
390+
SI.LEFT1,
391391
-1,
392392
drop_down_item_list[drop_down_selected_item],
393393
font,
@@ -408,12 +408,12 @@ function start()
408408
user_input_state.cursor,
409409
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
410410
layout,
411-
SI.DOWN_OUT_LEFT_IN,
411+
SI.DOWN2_LEFT1,
412412
padding,
413413
SD.get_height(font),
414414
SD.get_width(font) * (max_num_chars + 2),
415415
image,
416-
SI.LEFT_IN,
416+
SI.LEFT1,
417417
-1,
418418
item,
419419
font,
@@ -436,12 +436,12 @@ function start()
436436
user_input_state.cursor,
437437
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
438438
layout,
439-
SI.DOWN_OUT_LEFT_IN,
439+
SI.DOWN2_LEFT1,
440440
padding,
441441
SD.get_height(font),
442442
SD.get_width(font) * 12,
443443
image,
444-
SI.UP_IN_LEFT_IN,
444+
SI.UP1_LEFT1,
445445
-1,
446446
"CheckBox",
447447
font,
@@ -460,12 +460,12 @@ function start()
460460
user_input_state.cursor,
461461
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
462462
layout,
463-
SI.RIGHT_OUT,
463+
SI.RIGHT2,
464464
padding,
465465
SD.get_height(font),
466466
SD.get_width(font) * (SI.get_num_printable_characters(text) + 2),
467467
image,
468-
SI.LEFT_IN,
468+
SI.LEFT1,
469469
-1,
470470
text,
471471
font,
@@ -485,12 +485,12 @@ function start()
485485
user_input_state.cursor,
486486
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
487487
layout,
488-
SI.DOWN_OUT_LEFT_IN,
488+
SI.DOWN2_LEFT1,
489489
padding,
490490
SD.get_height(font),
491491
SD.get_width(font) * SI.get_num_printable_characters(text),
492492
image,
493-
SI.UP_IN_LEFT_IN,
493+
SI.UP1_LEFT1,
494494
-1,
495495
text,
496496
font,

src/drawing.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ end
160160

161161
function draw_widget_unclipped!(image, widget_type::TextBox, bounding_box, user_interaction_state, this_widget, text, alignment, padding, font, background_color, border_color, text_color)
162162
if get_num_printable_characters(text) * SD.get_width(font) > bounding_box.width
163-
alignment = RIGHT_IN
163+
alignment = RIGHT1
164164
end
165165

166166
draw_text_line_in_a_box!(

0 commit comments

Comments
 (0)