alema/ugui
1
0
Fork 0
Code Issues Pull Requests Activity

MAYBE correct layout with next_row and next_column

Browse Source
This commit is contained in:
Alessandro Mauri 2025-02-01 01:01:13 +01:00
parent 92614e4d8b
commit c53b9eed5e
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.c3
View File

@ -152,7 +152,6 @@ fn int main(String[] args)
if (ui.check_key_combo(ugui::KMOD_CTRL, "q")) break; if (ui.check_key_combo(ugui::KMOD_CTRL, "q")) break;
// main div, fill the whole window
ui.div_begin("main", ugui::Rect{.w=-100})!!; ui.div_begin("main", ugui::Rect{.w=-100})!!;
{| {|
ui.layout_set_column()!!; ui.layout_set_column()!!;
@ -186,6 +185,17 @@ fn int main(String[] args)
ui.layout_next_row()!!; ui.layout_next_row()!!;
static bool check; static bool check;
ui.checkbox("check1", "", ugui::Point{}, &check)!!; ui.checkbox("check1", "", ugui::Point{}, &check)!!;
/*
ui.layout_set_column()!!;
ui.button_label(" A ")!!;
ui.button_label(" B ")!!;
ui.layout_next_column()!!;
ui.button_label(" C ")!!;
ui.button_label(" D ")!!;
ui.layout_next_row()!!;
ui.button_label(" E ")!!;
*/
|}; |};
ui.draw_sprite("sprite1", "tux")!!; ui.draw_sprite("sprite1", "tux")!!;
ui.div_end()!!; ui.div_end()!!;

2
src/ugui_div.c3
View File

@ -55,7 +55,7 @@ fn void! Ctx.div_begin(&ctx, String label, Rect size, bool scroll_x = false, boo
.h = size.h < 0 ? max(elem.div.pcb.h, (short)-size.h) : size.h, .h = size.h < 0 ? max(elem.div.pcb.h, (short)-size.h) : size.h,
}; };
elem.bounds = ctx.position_element(parent, wanted_size); elem.bounds = ctx.position_element(parent, wanted_size);
elem.div.children_bounds = elem.bounds; elem.div.children_bounds = Rect{};
// update the ctx scissor // update the ctx scissor
ctx.div_scissor = elem.bounds; ctx.div_scissor = elem.bounds;

8
src/ugui_layout.c3
View File

@ -52,13 +52,12 @@ fn void! Ctx.layout_next_row(&ctx)
Elem *parent = ctx.cache.search(parent_id)!; Elem *parent = ctx.cache.search(parent_id)!;
if (parent.type != ETYPE_DIV) { if (parent.type != ETYPE_DIV) {
// what?
return UgError.UNEXPECTED_ELEMENT?; return UgError.UNEXPECTED_ELEMENT?;
} }
parent.div.origin_r = Point{ parent.div.origin_r = Point{
.x = parent.bounds.x, .x = parent.bounds.x,
.y = parent.div.origin_c.y, .y = parent.div.children_bounds.bottom_right().y,
}; };
parent.div.origin_c = parent.div.origin_r; parent.div.origin_c = parent.div.origin_r;
} }
@ -69,12 +68,11 @@ fn void! Ctx.layout_next_column(&ctx)
Elem *parent = ctx.cache.search(parent_id)!; Elem *parent = ctx.cache.search(parent_id)!;
if (parent.type != ETYPE_DIV) { if (parent.type != ETYPE_DIV) {
// what?
return UgError.UNEXPECTED_ELEMENT?; return UgError.UNEXPECTED_ELEMENT?;
} }
parent.div.origin_c = Point{ parent.div.origin_c = Point{
.x = parent.div.origin_r.x, .x = parent.div.children_bounds.bottom_right().x,
.y = parent.bounds.y, .y = parent.bounds.y,
}; };
parent.div.origin_r = parent.div.origin_c; parent.div.origin_r = parent.div.origin_c;
@ -183,7 +181,7 @@ fn Rect Ctx.position_element(&ctx, Elem *parent, Rect rect, bool style = false)
if (child_occupied.bottom_right().x > div.children_bounds.bottom_right().x) { if (child_occupied.bottom_right().x > div.children_bounds.bottom_right().x) {
div.children_bounds.w += child_occupied.bottom_right().x - div.children_bounds.bottom_right().x; div.children_bounds.w += child_occupied.bottom_right().x - div.children_bounds.bottom_right().x;
} }
// left overflow // bottom overflow
if (child_occupied.bottom_right().y > div.children_bounds.bottom_right().y) { if (child_occupied.bottom_right().y > div.children_bounds.bottom_right().y) {
div.children_bounds.h += child_occupied.bottom_right().y - div.children_bounds.bottom_right().y; div.children_bounds.h += child_occupied.bottom_right().y - div.children_bounds.bottom_right().y;
} }