ed/SectrPrototype
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finished cam_zoom_mode settings entry, reduced anchor and alignment contraints for ui_layout_children_<> procs

Browse Source
This commit is contained in:
Edward R. Gonzalez 2024-11-30 02:34:11 -05:00
parent 7f8a068268
commit dd2f6e9c71
3 changed files with 31 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
code/sectr/app/screen.odin
View File

@ -398,44 +398,36 @@ ui_screen_settings_menu :: proc( captures : rawptr = nil ) -> ( should_raise : b
layout.font_size = 12
}
mode_selector := ui_drop_down( & zoom_mode_drop_down, "settings_menu.cam_zoom_mode.drop_down", str_intern_fmt("%v selected", config.cam_zoom_mode),
vb_compute_layout = true,
// vb_parent = app_config.vbox
)
mode_selector.btn.layout.anchor.ratio.x = 0.5
// TODO(Ed): This is technically a manual drop-down as the vbox within ui_dropdown is unusuable for attaching the buttons
// This can be alleviated if we add an option for the drop-down to support a floating vbox (fixed position computed, following drop_down btn)
// For now its buttons are attached to app_config vbox
mode_selector := ui_drop_down( & zoom_mode_drop_down, "settings_menu.cam_zoom_mode.drop_down", str_intern_fmt("%s", config.cam_zoom_mode), vb_compute_layout = true )
mode_selector.btn.layout.size.min = { 80, mode_selector.btn.layout.size.min.y }
if mode_selector.is_open
{
idx := 1
for entry in CameraZoomMode
{
ui_parent(app_config.vbox)
// scope( theme_table_row(is_even = idx % 2 == 0))
idx += 1
scope( theme_button)
btn := ui_button( str_intern_fmt("settings_menu.cam_zoom_mode.%v : option btn", entry).str )
btn.layout.size.min = {0, 25}
// btn.layout.alignment = {0, 0}
// btn.layout.anchor = {}
btn.layout.flags = {.Fixed_Height}
btn.layout.padding = to_ui_layout_side(4)
// ui_parent_push(btn)
ui_parent(btn)
push(theme_text)
// title := ui_text( str_intern_fmt("settings_menu.cam_zoom_mode.%v : option btn title").str, str_intern_fmt("%v", entry) )
scope(theme_button)
btn := ui_button(str_intern_fmt("settings_menu.cam_zoom_mode.%s.btn", entry).str)
{
using title
layout.anchor.ratio.x = 1.0
layout.margins.left = 10
layout.font_size = 12
using btn
layout.size.min = {100, 25}
layout.alignment = {1.0, 0}
layout.anchor.left = 1.0
layout.flags = {.Fixed_Height}
layout.padding = to_ui_layout_side(4)
ui_parent(btn)
scope(theme_text)
text_widget := ui_text(str_intern_fmt("settings_menu.cam_zoom_mode.%s.text", entry).str, str_intern_fmt("%s", entry))
}
// ui_parent_pop()
if btn.pressed {
mode_selector.should_close = true
config.cam_zoom_mode = entry
screen_ui.active = 0
config.cam_zoom_mode = entry
screen_ui.active = 0
}
}
}

16
code/sectr/ui/layout_widget.odin
View File

@ -69,8 +69,8 @@ ui_layout_children_horizontally :: proc( container : ^UI_Box, direction : UI_Lay
for child := container.first; child != nil; child = child.next {
using child.layout
child_width := allocate_space(child, total_stretch_ratio, avail_flex_space, container_height)
anchor = range2({0, 0}, {0, 0})
alignment = {0, 0}
anchor = range2({0, anchor.bottom}, {0, anchor.top})
alignment = {0, alignment.y}
pos.x = space_used
space_used += child_width + child.layout.margins.left + child.layout.margins.right
}
@ -78,8 +78,8 @@ ui_layout_children_horizontally :: proc( container : ^UI_Box, direction : UI_Lay
for child := container.first; child != nil; child = child.next {
using child.layout
child_width := allocate_space(child, total_stretch_ratio, avail_flex_space, container_height)
anchor = range2({1, 0}, {0, 0})
alignment = {1, 0}
anchor = range2({1, anchor.bottom}, {0, anchor.top})
alignment = {1, alignment.y}
pos.x = space_used
space_used -= child_width + child.layout.margins.left + child.layout.margins.right
}
@ -148,8 +148,8 @@ ui_layout_children_vertically :: proc( container : ^UI_Box, direction : UI_Layou
for child := container.first; child != nil; child = child.next {
using child.layout
child_height := allocate_space(child, total_stretch_ratio, avail_flex_space, container_width)
anchor = range2({0, 1}, {0, 0})
alignment = {0, 1}
anchor = range2({anchor.left, 1}, {anchor.right, 0})
alignment = {alignment.x, 1}
pos.y = space_used
space_used -= child_height - child.layout.margins.top - child.layout.margins.bottom
}
@ -157,8 +157,8 @@ ui_layout_children_vertically :: proc( container : ^UI_Box, direction : UI_Layou
for child := container.first; child != nil; child = child.next {
using child.layout
child_height := allocate_space(child, total_stretch_ratio, avail_flex_space, container_width)
anchor = range2({0,0}, {0, 0})
alignment = {0, 0}
anchor = range2({anchor.left,0}, {anchor.right, 0})
alignment = {alignment.x, 0}
pos.y = space_used
space_used += child_height - child.layout.margins.top - child.layout.margins.bottom
}

6
code/sectr/ui/widgets.odin
View File

@ -79,8 +79,10 @@ ui_drop_down_begin :: proc( drop_down : ^UI_DropDown, label : string, title_text
title = ui_text( str_intern_fmt("%s.btn.title", label).str, title_text)
}
is_open |= b32(btn.pressed)
is_open &= ! should_close
if btn.pressed {
is_open = ! is_open
}
is_open &= ! should_close
should_close = false
if is_open == false do return