stuff, mostly renaming variables

This commit is contained in:
Alessandro Mauri 2024-12-19 15:24:39 +01:00
parent 601a396aa8
commit 1088083e1e
7 changed files with 127 additions and 129 deletions

View file

@ -23,7 +23,9 @@ struct ElemDiv {
Rect children_bounds; // current frame children bounds
Rect pcb; // previous frame children bounds
Point origin_r, origin_c;
Color bgcolor;
// the id of the active element, this field is set and reset by the elements themselves and it is
// used to keep track of which element should handle some input events between frames
Id active_id;
}
fn void! Ctx.div_begin(&ctx, String label, Rect size, bool scroll_x = false, bool scroll_y = false)
@ -31,49 +33,48 @@ fn void! Ctx.div_begin(&ctx, String label, Rect size, bool scroll_x = false, boo
Id id = ctx.gen_id(label)!;
Elem* parent = ctx.get_parent()!;
Elem* c_elem = ctx.get_elem(id)!;
Elem* elem = ctx.get_elem(id)!;
isz div_node = ctx.tree.add(id, ctx.active_div)!;
ctx.active_div = div_node;
bool is_new = c_elem.flags.is_new;
bool is_new = elem.flags.is_new;
if (c_elem.flags.is_new) {
c_elem.type = ETYPE_DIV;
} else if (c_elem.type != ETYPE_DIV) {
if (elem.flags.is_new) {
elem.type = ETYPE_DIV;
} else if (elem.type != ETYPE_DIV) {
return UgError.WRONG_ELEMENT_TYPE?;
}
c_elem.div.scroll_x.enabled = scroll_x;
c_elem.div.scroll_y.enabled = scroll_y;
elem.div.scroll_x.enabled = scroll_x;
elem.div.scroll_y.enabled = scroll_y;
// 2. layout the element
c_elem.bounds = ctx.position_element(parent, size);
c_elem.div.children_bounds = c_elem.bounds;
c_elem.div.bgcolor = ctx.style.bgcolor;
elem.bounds = ctx.position_element(parent, size);
elem.div.children_bounds = elem.bounds;
// update the ctx scissor
ctx.div_scissor = c_elem.bounds;
ctx.push_scissor(c_elem.bounds)!;
ctx.div_scissor = elem.bounds;
ctx.push_scissor(elem.bounds)!;
// 4. Fill the div fields
c_elem.div.origin_c = Point{
.x = c_elem.bounds.x,
.y = c_elem.bounds.y,
elem.div.origin_c = Point{
.x = elem.bounds.x,
.y = elem.bounds.y,
};
c_elem.div.origin_r = c_elem.div.origin_c;
c_elem.div.layout = parent.div.layout;
elem.div.origin_r = elem.div.origin_c;
elem.div.layout = parent.div.layout;
// Add the background to the draw stack
bool do_border = parent.div.layout == LAYOUT_FLOATING;
ctx.push_rect(c_elem.bounds, c_elem.div.bgcolor, do_border: do_border)!;
ctx.push_rect(elem.bounds, ctx.style.bgcolor, do_border: do_border)!;
c_elem.events = ctx.get_elem_events(c_elem);
elem.events = ctx.get_elem_events(elem);
// TODO: check active
// TODO: check resizeable
if (parent.flags.has_focus) {
if (point_in_rect(ctx.input.mouse.pos, c_elem.bounds)) {
c_elem.flags.has_focus = true;
if (point_in_rect(ctx.input.mouse.pos, elem.bounds)) {
elem.flags.has_focus = true;
}
}
@ -83,12 +84,12 @@ fn void! Ctx.div_end(&ctx)
{
// swap the children bounds
Elem* parent = ctx.get_parent()!;
Elem* c_elem = ctx.get_elem_by_tree_idx(ctx.active_div)!;
c_elem.div.pcb = c_elem.div.children_bounds;
Elem* elem = ctx.get_elem_by_tree_idx(ctx.active_div)!;
elem.div.pcb = elem.div.children_bounds;
c_elem.events = ctx.get_elem_events(c_elem);
elem.events = ctx.get_elem_events(elem);
Rect cb = c_elem.div.pcb;
Rect cb = elem.div.pcb;
// children bounds bottom-right corner
Point cbc = {
.x = cb.x + cb.w,
@ -96,44 +97,43 @@ fn void! Ctx.div_end(&ctx)
};
// div bounds bottom-right corner
Point bc = {
.x = c_elem.bounds.x + c_elem.bounds.w,
.y = c_elem.bounds.y + c_elem.bounds.h,
.x = elem.bounds.x + elem.bounds.w,
.y = elem.bounds.y + elem.bounds.h,
};
// set the scrollbar flag, is used in layout
// horizontal overflow
c_elem.div.scroll_x.on = cbc.x > bc.x && c_elem.div.scroll_x.enabled;
elem.div.scroll_x.on = cbc.x > bc.x && elem.div.scroll_x.enabled;
// vertical overflow
c_elem.div.scroll_y.on = cbc.y > bc.y && c_elem.div.scroll_y.enabled;
elem.div.scroll_y.on = cbc.y > bc.y && elem.div.scroll_y.enabled;
short wdim = c_elem.div.scroll_y.focus ? SCROLLBAR_DIM*3 : SCROLLBAR_DIM;
short hdim = c_elem.div.scroll_x.focus ? SCROLLBAR_DIM*3 : SCROLLBAR_DIM;
short wdim = elem.div.scroll_y.on ? (elem.div.scroll_y.focus ? SCROLLBAR_DIM*3 : SCROLLBAR_DIM) : 0;
short hdim = elem.div.scroll_x.on ? (elem.div.scroll_x.focus ? SCROLLBAR_DIM*3 : SCROLLBAR_DIM) : 0;
if (c_elem.div.scroll_y.on) {
if (elem.div.scroll_y.on) {
Rect vslider = {
.x = c_elem.bounds.x + c_elem.bounds.w - wdim,
.y = c_elem.bounds.y,
.x = elem.bounds.x + elem.bounds.w - wdim,
.y = elem.bounds.y,
.w = wdim,
.h = c_elem.bounds.h,
.h = elem.bounds.h - hdim,
};
Layout prev_l = c_elem.div.layout;
c_elem.div.layout = LAYOUT_ABSOLUTE;
ctx.slider_ver("div_scrollbar_vertical", vslider, &c_elem.div.scroll_y.value, max((float)bc.y / cbc.y, (float)0.15))!;
c_elem.div.layout = prev_l;
Layout prev_l = elem.div.layout;
elem.div.layout = LAYOUT_ABSOLUTE;
ctx.slider_ver("div_scrollbar_vertical", vslider, &elem.div.scroll_y.value, max((float)bc.y / cbc.y, (float)0.15))!;
elem.div.layout = prev_l;
}
if (c_elem.div.scroll_x.on) {
if (elem.div.scroll_x.on) {
Rect hslider = {
.x = c_elem.bounds.x,
.y = c_elem.bounds.y + c_elem.bounds.h - hdim,
.w = c_elem.bounds.w,
.x = elem.bounds.x,
.y = elem.bounds.y + elem.bounds.h - hdim,
.w = elem.bounds.w - wdim,
.h = hdim,
};
Layout prev_l = c_elem.div.layout;
c_elem.div.layout = LAYOUT_ABSOLUTE;
ctx.slider_hor("div_scrollbar_horizontal", hslider, &c_elem.div.scroll_x.value, max((float)bc.x / cbc.x, (float)0.15))!;
c_elem.div.layout = prev_l;
Layout prev_l = elem.div.layout;
elem.div.layout = LAYOUT_ABSOLUTE;
ctx.slider_hor("div_scrollbar_horizontal", hslider, &elem.div.scroll_x.value, max((float)bc.x / cbc.x, (float)0.15))!;
elem.div.layout = prev_l;
}
// the active_div returns to the parent of the current one