cessen/led
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed minor bug in cursor navigation.

Browse Source
This commit is contained in:
Nathan Vegdahl 2017-12-31 03:04:25 -08:00
parent 76bd98e5ae
commit 29b17f6e20
1 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/editor/mod.rs
View File

@ -571,30 +571,33 @@ impl<T: LineFormatter> Editor<T> {
pub fn cursor_up(&mut self, n: usize) { pub fn cursor_up(&mut self, n: usize) {
for c in self.cursors.iter_mut() { for c in self.cursors.iter_mut() {
let vmove = -1 * (n * self.formatter.single_line_height()) as isize; let vmove = -1 * (n * self.formatter.single_line_height()) as isize;
let mut temp_index = self.formatter.index_offset_vertical_v2d( let mut temp_index = self.formatter.index_offset_vertical_v2d(
&self.buffer, &self.buffer,
c.range.0, c.range.0,
vmove, vmove,
(Round, Round), (Round, Round),
); );
temp_index = self.formatter.index_set_horizontal_v2d(
if temp_index == 0 { &self.buffer,
c.update_vis_start(&(self.buffer), &(self.formatter)); temp_index,
} else { c.vis_start,
temp_index = self.formatter.index_set_horizontal_v2d( Round,
&self.buffer, );
temp_index,
c.vis_start,
Round,
);
}
if !self.buffer.is_grapheme(temp_index) { if !self.buffer.is_grapheme(temp_index) {
temp_index = self.buffer.nth_prev_grapheme(temp_index, 1); temp_index = self.buffer.nth_prev_grapheme(temp_index, 1);
} }
c.range.0 = temp_index; if temp_index == c.range.0 {
c.range.1 = temp_index; // We were already at the top.
c.range.0 = 0;
c.range.1 = 0;
c.update_vis_start(&(self.buffer), &(self.formatter));
} else {
c.range.0 = temp_index;
c.range.1 = temp_index;
}
} }
// Adjust view // Adjust view
@ -604,30 +607,33 @@ impl<T: LineFormatter> Editor<T> {
pub fn cursor_down(&mut self, n: usize) { pub fn cursor_down(&mut self, n: usize) {
for c in self.cursors.iter_mut() { for c in self.cursors.iter_mut() {
let vmove = (n * self.formatter.single_line_height()) as isize; let vmove = (n * self.formatter.single_line_height()) as isize;
let mut temp_index = self.formatter.index_offset_vertical_v2d( let mut temp_index = self.formatter.index_offset_vertical_v2d(
&self.buffer, &self.buffer,
c.range.0, c.range.0,
vmove, vmove,
(Round, Round), (Round, Round),
); );
temp_index = self.formatter.index_set_horizontal_v2d(
if temp_index == self.buffer.char_count() { &self.buffer,
c.update_vis_start(&(self.buffer), &(self.formatter)); temp_index,
} else { c.vis_start,
temp_index = self.formatter.index_set_horizontal_v2d( Round,
&self.buffer, );
temp_index,
c.vis_start,
Round,
);
}
if !self.buffer.is_grapheme(temp_index) { if !self.buffer.is_grapheme(temp_index) {
temp_index = self.buffer.nth_prev_grapheme(temp_index, 1); temp_index = self.buffer.nth_prev_grapheme(temp_index, 1);
} }
c.range.0 = temp_index; if temp_index == c.range.0 {
c.range.1 = temp_index; // We were already at the bottom.
c.range.0 = self.buffer.char_count();
c.range.1 = self.buffer.char_count();
c.update_vis_start(&(self.buffer), &(self.formatter));
} else {
c.range.0 = temp_index;
c.range.1 = temp_index;
}
} }
// Adjust view // Adjust view