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

ViEditor: fix cursor and select positions

Browse source
This commit is contained in:
Jeremy Soller 2023-10-27 13:17:56 -06:00
parent ad10e7373b
commit 423fc22439
No known key found for this signature in database
GPG key ID: DCFCA852D3906975
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/edit/vi.rs
View file

@ -419,6 +419,7 @@ impl<'a> Edit for ViEditor<'a> {
for run in self.buffer().layout_runs() { for run in self.buffer().layout_runs() {
let line_i = run.line_i; let line_i = run.line_i;
let line_y = run.line_y; let line_y = run.line_y;
let line_top = run.line_top;
let cursor_glyph_opt = |cursor: &Cursor| -> Option<(usize, f32, f32)> { let cursor_glyph_opt = |cursor: &Cursor| -> Option<(usize, f32, f32)> {
//TODO: better calculation of width //TODO: better calculation of width
@ -497,7 +498,7 @@ impl<'a> Edit for ViEditor<'a> {
} else if let Some((min, max)) = range_opt.take() { } else if let Some((min, max)) = range_opt.take() {
f( f(
min, min,
(line_y - font_size) as i32, line_top as i32,
cmp::max(0, max - min) as u32, cmp::max(0, max - min) as u32,
line_height as u32, line_height as u32,
Color::rgba(color.r(), color.g(), color.b(), 0x33), Color::rgba(color.r(), color.g(), color.b(), 0x33),
@ -523,7 +524,7 @@ impl<'a> Edit for ViEditor<'a> {
} }
f( f(
min, min,
(line_y - font_size) as i32, line_top as i32,
cmp::max(0, max - min) as u32, cmp::max(0, max - min) as u32,
line_height as u32, line_height as u32,
Color::rgba(color.r(), color.g(), color.b(), 0x33), Color::rgba(color.r(), color.g(), color.b(), 0x33),
@ -583,7 +584,7 @@ impl<'a> Edit for ViEditor<'a> {
let right_x = cmp::max(start_x, end_x); let right_x = cmp::max(start_x, end_x);
f( f(
left_x, left_x,
(line_y - font_size) as i32, line_top as i32,
(right_x - left_x) as u32, (right_x - left_x) as u32,
line_height as u32, line_height as u32,
Color::rgba(color.r(), color.g(), color.b(), 0x33), Color::rgba(color.r(), color.g(), color.b(), 0x33),
@ -591,7 +592,7 @@ impl<'a> Edit for ViEditor<'a> {
} else { } else {
f( f(
start_x, start_x,
(line_y - font_size) as i32, line_top as i32,
1, 1,
line_height as u32, line_height as u32,
color, color,