alema/ugui.c3l
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

forgot the baseline

Browse source
This commit is contained in:
Alessandro Mauri 2024-12-11 20:39:06 +01:00
parent 2356d165fe
commit 61556d0a2c
3 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/ugui_text.c3
View file

@ -15,6 +15,8 @@ fn void! Ctx.text_unbounded(&ctx, String label, String text)
// this resets the flags
c_elem.type = ETYPE_TEXT;
short line_height = (short)ctx.font.ascender - (short)ctx.font.descender;
short baseline = (short)ctx.font.ascender;
bool update_atlas;
// if the element is new or the parent was updated then redo layout
if (c_elem.flags.is_new || parent.flags.updated) {
@ -26,8 +28,8 @@ fn void! Ctx.text_unbounded(&ctx, String label, String text)
Codepoint cp = (Codepoint)c;
bool n;
gp = ctx.font.get_glyph(cp, &n)!;
text_size.w += gp.w + gp.ox + gp.adv;
text_size.h += gp.h + gp.oy;
text_size.w += gp.adv;
text_size.h += line_height;
if (n) { update_atlas = true; }
}
@ -64,7 +66,7 @@ fn void! Ctx.text_unbounded(&ctx, String label, String text)
.type = CMD_SPRITE,
.sprite.rect = {
.x = orig.x + gp.ox,
.y = orig.y + gp.oy,
.y = orig.y + gp.oy + baseline,
.w = gp.w,
.h = gp.h,
},
@ -75,7 +77,7 @@ fn void! Ctx.text_unbounded(&ctx, String label, String text)
.h = gp.h,
},
};
orig.x += gp.w + gp.ox;
orig.x += gp.adv;
ctx.cmd_queue.enqueue(&cmd)!;
}
}