Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename alignment names #64

Merged
merged 2 commits into from
Aug 17, 2022
Merged

rename alignment names #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e2cb113
rename alignments
Sid-Bhatia-0 Aug 17, 2022
01263e3
add more details to docstring for Alignment
Sid-Bhatia-0 Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions examples/example.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.UP_IN_LEFT_IN,
SI.UP1_LEFT1,
padding,
SD.get_height(font),
SD.get_width(font) * SI.get_num_printable_characters(text),
image,
SI.UP_IN_LEFT_IN,
SI.UP1_LEFT1,
-1,
text,
font,
Expand All @@ -150,12 +150,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.DOWN_OUT_LEFT_IN,
SI.DOWN2_LEFT1,
padding,
SD.get_height(font),
SD.get_width(font) * 12,
image,
SI.UP_IN_LEFT_IN,
SI.UP1_LEFT1,
-1,
"Button",
font,
Expand All @@ -172,7 +172,7 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.RIGHT_OUT,
SI.RIGHT2,
padding,
SD.get_height(font),
240,
Expand All @@ -197,12 +197,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.DOWN_OUT_LEFT_IN,
SI.DOWN2_LEFT1,
padding,
SD.get_height(font),
SD.get_width(font) * 12,
image,
SI.UP_IN_LEFT_IN,
SI.UP1_LEFT1,
-1,
"Slider",
font,
Expand All @@ -220,7 +220,7 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.RIGHT_OUT,
SI.RIGHT2,
padding,
SD.get_height(font),
240,
Expand All @@ -243,12 +243,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.DOWN_OUT_LEFT_IN,
SI.DOWN2_LEFT1,
padding,
SD.get_height(font),
SD.get_width(font) * 12,
image,
SI.UP_IN_LEFT_IN,
SI.UP1_LEFT1,
-1,
"TextBox",
font,
Expand All @@ -267,12 +267,12 @@ function start()
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
user_input_state.characters,
layout,
SI.RIGHT_OUT,
SI.RIGHT2,
padding,
SD.get_height(font),
240,
image,
SI.LEFT_IN,
SI.LEFT1,
-1,
font,
SI.ContextualColor(0x00b0b0b0, 0x00b7b7b7, 0x00bfbfbf),
Expand All @@ -298,12 +298,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.DOWN_OUT_LEFT_IN,
SI.DOWN2_LEFT1,
padding,
SD.get_height(font),
SD.get_width(font) * 12,
image,
SI.UP_IN_LEFT_IN,
SI.UP1_LEFT1,
-1,
"RadioButton",
font,
Expand All @@ -327,12 +327,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.RIGHT_OUT,
SI.RIGHT2,
padding,
SD.get_height(font),
SD.get_width(font) * (max_num_chars + 2),
image,
SI.LEFT_IN,
SI.LEFT1,
-1,
item,
font,
Expand All @@ -354,12 +354,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.DOWN_OUT_LEFT_IN,
SI.DOWN2_LEFT1,
padding,
SD.get_height(font),
SD.get_width(font) * 12,
image,
SI.UP_IN_LEFT_IN,
SI.UP1_LEFT1,
-1,
"DropDown",
font,
Expand All @@ -382,12 +382,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.RIGHT_OUT,
SI.RIGHT2,
padding,
SD.get_height(font),
SD.get_width(font) * (max_num_chars + 2),
image,
SI.LEFT_IN,
SI.LEFT1,
-1,
drop_down_item_list[drop_down_selected_item],
font,
Expand All @@ -408,12 +408,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.DOWN_OUT_LEFT_IN,
SI.DOWN2_LEFT1,
padding,
SD.get_height(font),
SD.get_width(font) * (max_num_chars + 2),
image,
SI.LEFT_IN,
SI.LEFT1,
-1,
item,
font,
Expand All @@ -436,12 +436,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.DOWN_OUT_LEFT_IN,
SI.DOWN2_LEFT1,
padding,
SD.get_height(font),
SD.get_width(font) * 12,
image,
SI.UP_IN_LEFT_IN,
SI.UP1_LEFT1,
-1,
"CheckBox",
font,
Expand All @@ -460,12 +460,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.RIGHT_OUT,
SI.RIGHT2,
padding,
SD.get_height(font),
SD.get_width(font) * (SI.get_num_printable_characters(text) + 2),
image,
SI.LEFT_IN,
SI.LEFT1,
-1,
text,
font,
Expand All @@ -485,12 +485,12 @@ function start()
user_input_state.cursor,
user_input_state.mouse_buttons[Int(GLFW.MOUSE_BUTTON_LEFT) + 1],
layout,
SI.DOWN_OUT_LEFT_IN,
SI.DOWN2_LEFT1,
padding,
SD.get_height(font),
SD.get_width(font) * SI.get_num_printable_characters(text),
image,
SI.UP_IN_LEFT_IN,
SI.UP1_LEFT1,
-1,
text,
font,
Expand Down
2 changes: 1 addition & 1 deletion src/drawing.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ end

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)
if get_num_printable_characters(text) * SD.get_width(font) > bounding_box.width
alignment = RIGHT_IN
alignment = RIGHT1
end

draw_text_line_in_a_box!(
Expand Down
Loading