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

Moved settings menu to its own file, got min_size based on content working (only for the settings menu)

Browse Source
This commit is contained in:
Edward R. Gonzalez
2024-12-30 12:22:41 -05:00
parent 57d51fc7b1
commit 8905105d40
6 changed files with 616 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/sectr/ui/core/layout.odin
View File

@ -113,6 +113,11 @@ UI_LayoutFlag :: enum u32 {
// For this to work, the children must have a minimum size set & their size overall must be greater than the parent's minimum size
Size_To_Content,
// Will set minimum size to the child with the furthest bounds on X
Min_Size_To_Content_X,
// Will set minimum size to the child with the furthest bounds on Y
Min_Size_To_Content_Y,
// Will size the box to its text.
Size_To_Text,

44
code/sectr/ui/core/layout_compute.odin
View File

@ -99,12 +99,36 @@ ui_box_compute_layout :: proc( box : ^UI_Box,
adjusted_size.y = layout.size.min.y
}
border_offset := Vec2 { layout.border_width, layout.border_width }
// TODO(Ed): These are still WIP
if .Size_To_Content in layout.flags {
// Preemtively traverse the children of this parent and have them compute their layout.
// This parent will just set its size to the max bounding area of those children.
// This will recursively occur if child also depends on their content size from their children, etc.
ui_box_compute_layout_children(box)
//ui_compute_children_bounding_area(box)
// ui_box_compute_layout_children(box)
children_bounds := ui_compute_children_overall_bounds(box)
resolved_bounds := range2(
children_bounds.min - { layout.padding.left, layout.padding.bottom } - border_offset,
children_bounds.max + { layout.padding.right, layout.padding.top } + border_offset,
)
adjusted_size = size_range2( resolved_bounds )
}
if .Min_Size_To_Content_X in layout.flags {
children_bounds := ui_compute_children_overall_bounds(box)
resolved_bounds := range2(
children_bounds.min - { layout.padding.left, layout.padding.bottom } - border_offset,
children_bounds.max + { layout.padding.right, layout.padding.top } + border_offset,
)
adjusted_size.x = size_range2( resolved_bounds ).x
}
if .Min_Size_To_Content_Y in layout.flags {
children_bounds := ui_compute_children_overall_bounds(box)
resolved_bounds := range2(
children_bounds.min - { layout.padding.left, layout.padding.bottom } - border_offset,
children_bounds.max + { layout.padding.right, layout.padding.top } + border_offset,
)
adjusted_size.y = size_range2(resolved_bounds).y
}
// 5. Determine relative position
@ -146,8 +170,6 @@ ui_box_compute_layout :: proc( box : ^UI_Box,
// 7. Padding & Content
// Determine Padding's outer bounds
border_offset := Vec2 { layout.border_width, layout.border_width }
padding_bounds := range2(
bounds.min + border_offset,
bounds.min - border_offset,
@ -183,9 +205,19 @@ ui_box_compute_layout :: proc( box : ^UI_Box,
computed.fresh = true && !dont_mark_fresh
}
ui_compute_children_bounding_area :: proc ( box : ^UI_Box )
ui_compute_children_overall_bounds :: proc ( box : ^UI_Box ) -> ( children_bounds : Range2 )
{
// TODO(Ed): Implement this so we can have the .Size_To_Content flag supported.
for current := box.first; current != nil && current.prev != box; current = ui_box_tranverse_next_depth_first( current )
{
if current == box do return
if ! current.computed.fresh do ui_box_compute_layout( current )
if current == box.first {
children_bounds = current.computed.bounds
continue
}
children_bounds = join_range2( current.computed.bounds, children_bounds )
}
return
}
ui_box_compute_layout_children :: proc( box : ^UI_Box )