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

fix selection edge cases

Browse Source
This commit is contained in:
Alessandro Mauri 2025-10-19 22:53:57 +02:00
parent 2eec1fb710
commit a512fe6c71
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ugui.c3l/src/string.c3
View File

@ -79,6 +79,7 @@ struct GlyphIterator {
Codepoint cp; Codepoint cp;
Glyph* gp; Glyph* gp;
short adv; // prev advance
Point o; Point o;
Rect str_bounds; Rect str_bounds;
} }
@ -239,6 +240,8 @@ fn Rect? GlyphIterator.next(&self)
Rect b = {.x = self.o.x, .y = self.o.y}; Rect b = {.x = self.o.x, .y = self.o.y};
Point prev_o = self.o;
self.adv = 0;
switch { switch {
case self.cp == '\n': case self.cp == '\n':
if (self.anchor == TOP_LEFT) { if (self.anchor == TOP_LEFT) {
@ -265,6 +268,7 @@ fn Rect? GlyphIterator.next(&self)
} }
} }
self.o.x += self.gp.adv; self.o.x += self.gp.adv;
self.adv = self.o.x - prev_o.x;
} }
return b; return b;
@ -447,9 +451,9 @@ fn void? Ctx.draw_string_selection(&ctx, String text, Rect bounds, Anchor anchor
{ {
if (text == "") return; if (text == "") return;
if (bounds.w <= 0 || bounds.h <= 0) return; if (bounds.w <= 0 || bounds.h <= 0) return;
if (start > end) @swap(start, end); if (start > end) @swap(start, end);
// Ensure start < end // Ensure start < end
if (start > end) { if (start > end) {
usz temp = start; usz temp = start;
@ -476,7 +480,7 @@ fn void? Ctx.draw_string_selection(&ctx, String text, Rect bounds, Anchor anchor
if (sel_line != -1) { if (sel_line != -1) {
ctx.push_rect(sel_rect, z_index, &&{.bg = hue})!; ctx.push_rect(sel_rect, z_index, &&{.bg = hue})!;
} }
sel_rect = {.x = gi.o.x - b.w, .y = gi.o.y, .w = 0, .h = gi.line_height}; sel_rect = {.x = gi.o.x - gi.adv, .y = gi.o.y, .w = 0, .h = gi.line_height};
sel_line = line; sel_line = line;
} }
if (in_selection) { if (in_selection) {

1
lib/ugui.c3l/src/textedit.c3
View File

@ -44,7 +44,6 @@ fn bool Ctx.text_edit(&ctx, TextEdit* te)
// TODO: mod.end // TODO: mod.end
// TODO: selection with shift+arrows // TODO: selection with shift+arrows
println("cursor: ", te.cursor, " sel_len: ", te.sel_len);
return te.chars < te.buffer.len; return te.chars < te.buffer.len;
} }