leyoda/cosmic-text
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix off by one with end of selection

Browse source
This commit is contained in:
Jeremy Soller 2022-10-19 10:20:22 -06:00
parent 190b41f387
commit 66f9fea001
No known key found for this signature in database
GPG key ID: 87F211AF2BE4C2FE
1 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/buffer.rs
View file

@ -511,23 +511,25 @@ impl<'a> TextBuffer<'a> {
let end_glyph = if end.line == line_i_scrolled { let end_glyph = if end.line == line_i_scrolled {
end.glyph end.glyph
} else { } else {
line.glyphs.len() line.glyphs.len() + 1
}; };
let start_x = line.glyphs.get(start_glyph).map_or(0, |glyph| { if end_glyph > start_glyph {
glyph.x as i32 let start_x = line.glyphs.get(start_glyph).map_or(0, |glyph| {
}); glyph.x as i32
let end_x = line.glyphs.get(end_glyph).map_or(self.width, |glyph| { });
(glyph.x + glyph.w) as i32 let end_x = line.glyphs.get(end_glyph - 1).map_or(self.width, |glyph| {
}); (glyph.x + glyph.w) as i32
});
f( f(
start_x, start_x,
line_y - font_size, line_y - font_size,
cmp::max(0, end_x - start_x) as u32, cmp::max(0, end_x - start_x) as u32,
line_height as u32, line_height as u32,
0x33_00_00_00 | (color & 0xFF_FF_FF) 0x33_00_00_00 | (color & 0xFF_FF_FF)
); );
}
} }
} }