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

offset first character of a line to make alignment prettier

Browse Source
This commit is contained in:
Alessandro Mauri 2025-09-30 22:16:42 +02:00
parent 225f61079d
commit 6a7dd998a6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ugui.c3l/src/ugui_font.c3
View File

@ -363,6 +363,7 @@ fn Rect? Ctx.layout_string(&ctx, String text, Rect bounds, Anchor anchor, int z_
Codepoint cp; Codepoint cp;
isz off = line_start; isz off = line_start;
short first_off;
for ITER: (usz x; (cp = str_to_codepoint(text[off..], &x)) != 0; off += x) { for ITER: (usz x; (cp = str_to_codepoint(text[off..], &x)) != 0; off += x) {
Glyph* gp = font.get_glyph(cp)!; Glyph* gp = font.get_glyph(cp)!;
@ -375,6 +376,8 @@ fn Rect? Ctx.layout_string(&ctx, String text, Rect bounds, Anchor anchor, int z_
case ascii::is_cntrl((char)cp): case ascii::is_cntrl((char)cp):
break; break;
default: default:
if (off == line_start) first_off = gp.ox;
Rect b = { Rect b = {
.x = o.x + gp.ox, .x = o.x + gp.ox,
.y = o.y + gp.oy + baseline, .y = o.y + gp.oy + baseline,
@ -393,7 +396,7 @@ fn Rect? Ctx.layout_string(&ctx, String text, Rect bounds, Anchor anchor, int z_
if (line_end == line_start) unreachable("something went wrong in measuring the line"); if (line_end == line_start) unreachable("something went wrong in measuring the line");
// with the line width calculate the right origin and layout the line // with the line width calculate the right origin and layout the line
origin.x = bounds.x; origin.x = bounds.x - first_off;
short next_line_x = bounds.x; // the x coordinate of the origin if the line_width is zero short next_line_x = bounds.x; // the x coordinate of the origin if the line_width is zero
switch (anchor) { switch (anchor) {
case TOP_LEFT: nextcase; case TOP_LEFT: nextcase;
@ -446,7 +449,6 @@ fn Rect? Ctx.layout_string(&ctx, String text, Rect bounds, Anchor anchor, int z_
.h = gp.h .h = gp.h
}; };
ctx.push_sprite(b, uv, texture_id, z_index, hue)!; ctx.push_sprite(b, uv, texture_id, z_index, hue)!;
//ctx.push_rect(b, z_index, &&(Style){.bg=0x0000ff66u.@to_rgba()})!;
origin.x += gp.adv; origin.x += gp.adv;
} }