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

fix absolute placement and scrollbar

Browse Source
This commit is contained in:
Alessandro Mauri 2025-10-28 00:26:18 +01:00
parent 66acf8d4a3
commit 665e10fa30
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/layout.c3
View File

@ -205,7 +205,7 @@ fn void resolve_placement(Elem* c, Elem* p)
// if the element has absolute position assign the origin and do not update the parent // if the element has absolute position assign the origin and do not update the parent
if (cl.absolute) { if (cl.absolute) {
c.bounds.x = p.bounds.x + pl.content_offset.x + cl.origin.x; c.bounds.x = p.bounds.x + pl.content_offset.x + cl.origin.x;
c.bounds.y = p.bounds.x + pl.content_offset.x + cl.origin.y; c.bounds.y = p.bounds.y + pl.content_offset.y + cl.origin.y;
return; return;
} }

9
src/widgets/slider.c3
View File

@ -140,23 +140,22 @@ fn void? Ctx.scrollbar(&ctx, Id id, float *value, float handle_percent, bool ver
Style* style = ctx.styles.get_style(@str_hash("scrollbar")); Style* style = ctx.styles.get_style(@str_hash("scrollbar"));
Rect pb = parent.bounds.pad(parent.layout.content_offset); Rect pb = parent.bounds.pad(parent.layout.content_offset);
elem.bounds.x = vertical ? pb.bottom_right().x - style.size: pb.x;
elem.bounds.y = vertical ? pb.y : pb.bottom_right().y - style.size;
if (vertical) { if (vertical) {
elem.layout.w = @exact(style.size); elem.layout.w = @exact(style.size);
elem.layout.h = @grow(); elem.layout.h = @grow();
elem.bounds.x -= style.margin.x + style.margin.w + style.border.x + style.border.w; elem.layout.origin.x = pb.w - style.size;
elem.layout.origin.y = 0;
} else { } else {
elem.layout.w = @grow(); elem.layout.w = @grow();
elem.layout.h = @exact(style.size); elem.layout.h = @exact(style.size);
elem.bounds.y -= style.margin.y + style.margin.h + style.border.y + style.border.h; elem.layout.origin.x = 0;
elem.layout.origin.y = pb.h - style.size;
} }
elem.layout.content_offset = style.margin + style.border + style.padding; elem.layout.content_offset = style.margin + style.border + style.padding;
elem.layout.absolute = true; elem.layout.absolute = true;
update_parent_size(elem, parent); update_parent_size(elem, parent);
Rect content_bounds = elem.bounds.pad(elem.layout.content_offset); Rect content_bounds = elem.bounds.pad(elem.layout.content_offset);
//elem.events = ctx.get_elem_events(elem);
short o = vertical ? content_bounds.y : content_bounds.x; short o = vertical ? content_bounds.y : content_bounds.x;
short m = vertical ? ctx.input.mouse.pos.y : ctx.input.mouse.pos.x; short m = vertical ? ctx.input.mouse.pos.y : ctx.input.mouse.pos.x;