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

fix cursor placement

Browse Source
This commit is contained in:
Alessandro Mauri 2025-09-27 12:43:38 +02:00
parent f1b6321d3d
commit d47b835020
1 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -414,19 +414,12 @@ fn Rect? Ctx.layout_string(&ctx, String text, Rect bounds, Anchor anchor, int z_
next_line_x += bounds.w; next_line_x += bounds.w;
} }
// reset the cursor to the line
if (line_start <= cursor && cursor <= line_end) { if (line_start <= cursor && cursor <= line_end) {
cursor_rect.x = origin.x; cursor_rect.x = origin.x;
cursor_rect.y = origin.y; cursor_rect.y = origin.y;
cursor_rect.w = 0; cursor_rect.w = 0;
if (cursor && text[cursor-1] == '\n') {
cursor_rect.x = next_line_x;
cursor_rect.y += line_height;
}
} }
Point line_origin = origin;
// see the fixme when measuring the height // see the fixme when measuring the height
//ctx.push_rect({.x = origin.x,.y=origin.y,.w=(short)line_width,.h=(short)string_height}, z_index, &&(Style){.bg=0xff000042u.@to_rgba()})!; //ctx.push_rect({.x = origin.x,.y=origin.y,.w=(short)line_width,.h=(short)string_height}, z_index, &&(Style){.bg=0xff000042u.@to_rgba()})!;
String line = text[line_start:line_end-line_start]; String line = text[line_start:line_end-line_start];
@ -454,22 +447,26 @@ fn Rect? Ctx.layout_string(&ctx, String text, Rect bounds, Anchor anchor, int z_
}; };
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()})!; //ctx.push_rect(b, z_index, &&(Style){.bg=0x0000ff66u.@to_rgba()})!;
origin.x += gp.adv; origin.x += gp.adv;
} }
if (line_start + off < cursor && text[cursor-1] != '\n') { if (line_start + off + x == cursor) {
cursor_rect.x = origin.x; cursor_rect.x = origin.x;
cursor_rect.y = origin.y;
cursor_rect.w = gp.adv;
} }
} }
// done with the line // done with the line
line_start = line_end; line_start = line_end;
origin.y += line_height + line_gap; origin.y += line_height + line_gap;
if (cursor == text.len && text[^1] == '\n') {
cursor_rect.x = next_line_x;
cursor_rect.y = origin.y;
}
} while(line_end < text.len); } while(line_end < text.len);
ctx.reset_scissor(z_index)!; ctx.reset_scissor(z_index)!;
return cursor_rect; return cursor_rect;