leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More improvements for selection

Browse source
This commit is contained in:
Jeremy Soller 2022-10-04 21:32:26 -06:00
parent 5299dfaa8c
commit fab9c9464b
1 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

20
examples/text/src/main.rs
View file

@ -521,20 +521,32 @@ fn main() {
&& mouse_y >= line_y - font_size && mouse_y >= line_y - font_size
&& mouse_y < line_y - font_size + line_height && mouse_y < line_y - font_size + line_height
{ {
cursor_line = line_i + scroll as usize;
cursor_glyph = line.glyphs.len();
for (glyph_i, glyph) in line.glyphs.iter().enumerate() { for (glyph_i, glyph) in line.glyphs.iter().enumerate() {
if mouse_x >= line_x + glyph.x as i32 if mouse_x >= line_x + glyph.x as i32
&& mouse_x <= line_x + (glyph.x + glyph.w) as i32 && mouse_x <= line_x + (glyph.x + glyph.w) as i32
{ {
cursor_line = line_i + scroll as usize;
cursor_glyph = glyph_i; cursor_glyph = glyph_i;
} }
} }
} }
} else { } else {
if cursor_line == line_i + scroll as usize { if cursor_line == line_i + scroll as usize {
if ! line.glyphs.is_empty() { if cursor_glyph >= line.glyphs.len() {
let glyph_i = cmp::min(cursor_glyph, line.glyphs.len() - 1); let x = match line.glyphs.last() {
let glyph = &line.glyphs[glyph_i]; Some(glyph) => glyph.x + glyph.w,
None => 0.0
};
window.rect(
line_x + x as i32,
line_y - font_size,
(font_size / 2) as u32,
line_height as u32,
Color::rgba(0xFF, 0xFF, 0xFF, 0x20)
);
} else {
let glyph = &line.glyphs[cursor_glyph];
window.rect( window.rect(
line_x + glyph.x as i32, line_x + glyph.x as i32,
line_y - font_size, line_y - font_size,