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

Preserve cursor glyph when moving up/down

Browse source
This commit is contained in:
Jeremy Soller 2022-10-26 19:45:28 -06:00
parent 846c646043
commit 57feeb2901
1 changed files with 31 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/buffer.rs
View file

@ -233,6 +233,7 @@ pub struct TextBuffer<'a> {
height: i32, height: i32,
scroll: i32, scroll: i32,
cursor: TextCursor, cursor: TextCursor,
cursor_x_opt: Option<i32>,
select_opt: Option<TextCursor>, select_opt: Option<TextCursor>,
pub cursor_moved: bool, pub cursor_moved: bool,
pub redraw: bool, pub redraw: bool,
@ -253,6 +254,7 @@ impl<'a> TextBuffer<'a> {
height: 0, height: 0,
scroll: 0, scroll: 0,
cursor: TextCursor::default(), cursor: TextCursor::default(),
cursor_x_opt: None,
select_opt: None, select_opt: None,
cursor_moved: false, cursor_moved: false,
redraw: false, redraw: false,
@ -542,7 +544,6 @@ impl<'a> TextBuffer<'a> {
match action { match action {
TextAction::Previous => { TextAction::Previous => {
let line = &mut self.lines[self.cursor.line]; let line = &mut self.lines[self.cursor.line];
if self.cursor.index > 0 { if self.cursor.index > 0 {
// Find previous character index // Find previous character index
let mut prev_index = 0; let mut prev_index = 0;
@ -561,10 +562,10 @@ impl<'a> TextBuffer<'a> {
self.cursor.index = self.lines[self.cursor.line].text.len(); self.cursor.index = self.lines[self.cursor.line].text.len();
self.redraw = true; self.redraw = true;
} }
self.cursor_x_opt = None;
}, },
TextAction::Next => { TextAction::Next => {
let line = &mut self.lines[self.cursor.line]; let line = &mut self.lines[self.cursor.line];
if self.cursor.index < line.text.len() { if self.cursor.index < line.text.len() {
for (i, c) in line.text.grapheme_indices(true) { for (i, c) in line.text.grapheme_indices(true) {
if i == self.cursor.index { if i == self.cursor.index {
@ -578,6 +579,7 @@ impl<'a> TextBuffer<'a> {
self.cursor.index = 0; self.cursor.index = 0;
self.redraw = true; self.redraw = true;
} }
self.cursor_x_opt = None;
}, },
TextAction::Left => { TextAction::Left => {
let rtl_opt = self.lines[self.cursor.line].shape_opt.as_ref().map(|shape| shape.rtl); let rtl_opt = self.lines[self.cursor.line].shape_opt.as_ref().map(|shape| shape.rtl);
@ -602,17 +604,30 @@ impl<'a> TextBuffer<'a> {
TextAction::Up => { TextAction::Up => {
//TODO: make this preserve X as best as possible! //TODO: make this preserve X as best as possible!
let mut cursor = self.layout_cursor(&self.cursor); let mut cursor = self.layout_cursor(&self.cursor);
if self.cursor_x_opt.is_none() {
self.cursor_x_opt = Some(
cursor.glyph as i32 //TODO: glyph x position
);
}
if cursor.layout > 0 { if cursor.layout > 0 {
cursor.layout -= 1; cursor.layout -= 1;
} else if cursor.line > 0 { } else if cursor.line > 0 {
cursor.line -= 1; cursor.line -= 1;
cursor.layout = usize::max_value(); cursor.layout = usize::max_value();
} }
if let Some(cursor_x) = self.cursor_x_opt {
cursor.glyph = cursor_x as usize; //TODO: glyph x position
}
self.set_layout_cursor(cursor); self.set_layout_cursor(cursor);
}, },
TextAction::Down => { TextAction::Down => {
//TODO: make this preserve X as best as possible! //TODO: make this preserve X as best as possible!
let mut cursor = self.layout_cursor(&self.cursor); let mut cursor = self.layout_cursor(&self.cursor);
let layout_len = { let layout_len = {
let line = &mut self.lines[cursor.line]; let line = &mut self.lines[cursor.line];
let layout = line.layout( let layout = line.layout(
@ -622,23 +637,37 @@ impl<'a> TextBuffer<'a> {
); );
layout.len() layout.len()
}; };
if self.cursor_x_opt.is_none() {
self.cursor_x_opt = Some(
cursor.glyph as i32 //TODO: glyph x position
);
}
if cursor.layout + 1 < layout_len { if cursor.layout + 1 < layout_len {
cursor.layout += 1; cursor.layout += 1;
} else if cursor.line + 1 < self.lines.len() { } else if cursor.line + 1 < self.lines.len() {
cursor.line += 1; cursor.line += 1;
cursor.layout = 0; cursor.layout = 0;
} }
if let Some(cursor_x) = self.cursor_x_opt {
cursor.glyph = cursor_x as usize; //TODO: glyph x position
}
self.set_layout_cursor(cursor); self.set_layout_cursor(cursor);
}, },
TextAction::Home => { TextAction::Home => {
let mut cursor = self.layout_cursor(&self.cursor); let mut cursor = self.layout_cursor(&self.cursor);
cursor.glyph = 0; cursor.glyph = 0;
self.set_layout_cursor(cursor); self.set_layout_cursor(cursor);
self.cursor_x_opt = None;
}, },
TextAction::End => { TextAction::End => {
let mut cursor = self.layout_cursor(&self.cursor); let mut cursor = self.layout_cursor(&self.cursor);
cursor.glyph = usize::max_value(); cursor.glyph = usize::max_value();
self.set_layout_cursor(cursor); self.set_layout_cursor(cursor);
self.cursor_x_opt = None;
} }
TextAction::PageUp => { TextAction::PageUp => {
//TODO: move cursor //TODO: move cursor