added a way to force a relayout

c3
Alessandro Mauri 4 days ago
parent d5bea68058
commit 537acd4765
  1. 53
      src/ugui_impl.c3
  2. 17
      src/ugui_input.c3

@ -28,13 +28,13 @@ macro Ctx.get_elem(&ctx, Id id)
// if it does't find one // if it does't find one
macro Ctx.get_elem_by_label(&ctx, String label) macro Ctx.get_elem_by_label(&ctx, String label)
{ {
Id id = label.hash(); Id id = label.hash();
return ctx.cache.search(id); return ctx.cache.search(id);
} }
macro Ctx.get_elem_by_tree_idx(&ctx, isz idx) @private macro Ctx.get_elem_by_tree_idx(&ctx, isz idx) @private
{ {
Id id = ctx.tree.get(ctx.active_div)!; Id id = ctx.tree.get(ctx.active_div)!;
return ctx.cache.search(id); return ctx.cache.search(id);
} }
@ -42,7 +42,6 @@ fn void! Ctx.init(&ctx)
{ {
ctx.tree.init(MAX_ELEMENTS)!; ctx.tree.init(MAX_ELEMENTS)!;
defer catch { (void)ctx.tree.free(); } defer catch { (void)ctx.tree.free(); }
//ug_fifo_init(&ctx.fifo, MAX_CMDS);
ctx.cache.init()!; ctx.cache.init()!;
defer catch { (void)ctx.cache.free(); } defer catch { (void)ctx.cache.free(); }
@ -72,31 +71,32 @@ fn void! Ctx.frame_begin(&ctx)
// The root should have the updated flag only if the size of the window // The root should have the updated flag only if the size of the window
// was changed between frames, this propagates an element size recalculation // was changed between frames, this propagates an element size recalculation
// down the element tree // down the element tree
c_elem.flags.updated = ctx.input.events.resize; c_elem.flags.updated = ctx.input.events.resize | ctx.input.events.force_update;
ctx.input.events.force_update = false;
// if the window has focus then the root element also has focus, no other // if the window has focus then the root element also has focus, no other
// computation needed, child elements need to check the mouse positon and // computation needed, child elements need to check the mouse positon and
// other stuff // other stuff
c_elem.flags.has_focus = ctx.has_focus; c_elem.flags.has_focus = ctx.has_focus;
if (c_elem.flags.is_new || c_elem.flags.updated) { if (c_elem.flags.is_new || c_elem.flags.updated) {
Elem def_root = { Elem def_root = {
.id = ROOT_ID, .id = ROOT_ID,
.type = ETYPE_DIV, .type = ETYPE_DIV,
.bounds = { .bounds = {
.w = ctx.width,
.h = ctx.height,
},
.div = {
.layout = LAYOUT_ROW,
.children_bounds = {
.w = ctx.width, .w = ctx.width,
.h = ctx.height, .h = ctx.height,
} },
}, .div = {
.flags = c_elem.flags, .layout = LAYOUT_ROW,
}; .children_bounds = {
.w = ctx.width,
*c_elem = def_root; .h = ctx.height,
}
},
.flags = c_elem.flags,
};
*c_elem = def_root;
} }
// 3. Push the root element into the element tree // 3. Push the root element into the element tree
@ -106,13 +106,20 @@ fn void! Ctx.frame_begin(&ctx)
// TODO: add a background color taken from a theme or config // TODO: add a background color taken from a theme or config
} }
fn void! Ctx.force_update(&ctx)
{
ctx.input.events.force_update = true;
}
fn void! Ctx.frame_end(&ctx) fn void! Ctx.frame_end(&ctx)
{ {
// 1. clear the tree // 1. clear the tree
ctx.tree.prune(0)!; ctx.tree.prune(0)!;
// 2. clear input fields // 2. clear input fields
bool f = ctx.input.events.force_update;
ctx.input.events = (InputEvents)0; ctx.input.events = (InputEvents)0;
ctx.input.events.force_update = f;
// draw mouse position // draw mouse position
$if 1: $if 1:
@ -130,9 +137,9 @@ $if 1:
$endif $endif
} }
/** <*
* @ensure elem != null * @ensure elem != null
**/ *>
fn bool Ctx.is_hovered(&ctx, Elem *elem) fn bool Ctx.is_hovered(&ctx, Elem *elem)
{ {
return point_in_rect(ctx.input.mouse.pos, elem.bounds); return point_in_rect(ctx.input.mouse.pos, elem.bounds);

@ -8,6 +8,7 @@ bitstruct InputEvents : uint {
bool change_focus : 1; // window focus changed bool change_focus : 1; // window focus changed
bool mouse_move : 2; // mouse was moved bool mouse_move : 2; // mouse was moved
bool mouse_btn : 3; // mouse button pressed or released bool mouse_btn : 3; // mouse button pressed or released
bool force_update : 4;
} }
// Window size was changed // Window size was changed
@ -82,16 +83,16 @@ macro Ctx.is_mouse_down(&ctx, MouseButtons btn)
macro ElemEvents Ctx.get_elem_events(&ctx, Elem *elem) macro ElemEvents Ctx.get_elem_events(&ctx, Elem *elem)
{ {
// TODO: add the other events // TODO: add the other events
// FIXME: active should be elsewhere // FIXME: active should be elsewhere
bool active = elem.events.mouse_hold || ctx.is_hovered(elem); bool active = elem.events.mouse_hold || ctx.is_hovered(elem);
ElemEvents ev = { ElemEvents ev = {
.mouse_hover = ctx.is_hovered(elem), .mouse_hover = ctx.is_hovered(elem),
.mouse_press = active & ctx.is_mouse_pressed(BTN_ANY), .mouse_press = active & ctx.is_mouse_pressed(BTN_ANY),
.mouse_release = active & ctx.is_mouse_released(BTN_ANY), .mouse_release = active & ctx.is_mouse_released(BTN_ANY),
.mouse_hold = active & ctx.is_mouse_down(BTN_ANY), .mouse_hold = active & ctx.is_mouse_down(BTN_ANY),
}; };
return ev; return ev;
} }
// Mouse Button moved // Mouse Button moved

Loading…
Cancel
Save