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

Fix scrolling with cursor

Browse source
This commit is contained in:
Jeremy Soller 2022-10-25 20:49:15 -06:00
parent c031944b45
commit e53956cb2d
4 changed files with 29 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/buffer.rs
View file

@ -246,6 +246,7 @@ pub struct TextBuffer<'a> {
scroll: i32,
cursor: TextCursor,
select_opt: Option<TextCursor>,
pub cursor_moved: bool,
pub redraw: bool,
}
@ -266,6 +267,7 @@ impl<'a> TextBuffer<'a> {
scroll: 0,
cursor: TextCursor::default(),
select_opt: None,
cursor_moved: false,
redraw: false,
};
buffer.set_text("");
@ -323,20 +325,9 @@ impl<'a> TextBuffer<'a> {
self.width
);
if line_i == self.cursor.line.get() {
for layout_line in layout {
let mut found = false;
for glyph in layout_line.glyphs.iter() {
if glyph.start <= self.cursor.index {
found = true;
break;
}
}
if found {
layout_i += 1;
} else {
break;
}
}
let layout_cursor = self.layout_cursor(&self.cursor);
layout_i += layout_cursor.layout as i32;
break;
} else {
layout_i += layout.len() as i32;
}
@ -559,6 +550,8 @@ impl<'a> TextBuffer<'a> {
/// Perform a [TextAction] on the buffer
pub fn action(&mut self, action: TextAction) {
let mut old_cursor = self.cursor;
match action {
TextAction::Previous => {
let line = &mut self.lines[self.cursor.line.get()];
@ -786,6 +779,10 @@ impl<'a> TextBuffer<'a> {
self.shape_until_scroll();
}
}
if old_cursor != self.cursor {
self.cursor_moved = true;
}
}
/// Convert x, y position to TextCursor (hit detection)