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

Fixed some minor behavior problems in cursor movement and pageup/pagedown.

Browse Source
This commit is contained in:
Nathan Vegdahl 2014-12-27 17:01:57 -08:00
parent 97e1259feb
commit 9e35085573
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/editor.rs
View File

@ -113,6 +113,14 @@ impl Editor {
self.move_view_to_cursor(); self.move_view_to_cursor();
} }
pub fn cursor_to_beginning_of_buffer(&mut self) {
self.cursor = (0, 0);
}
pub fn cursor_to_end_of_buffer(&mut self) {
self.cursor = self.buffer.pos_1d_to_closest_2d(self.buffer.len()+1);
}
pub fn cursor_left(&mut self) { pub fn cursor_left(&mut self) {
let p = self.buffer.pos_2d_to_closest_1d(self.cursor); let p = self.buffer.pos_2d_to_closest_1d(self.cursor);
@ -137,6 +145,9 @@ impl Editor {
if self.cursor.0 > 0 { if self.cursor.0 > 0 {
self.cursor.0 -= 1; self.cursor.0 -= 1;
} }
else {
self.cursor_to_beginning_of_buffer();
}
self.move_view_to_cursor(); self.move_view_to_cursor();
} }
@ -145,6 +156,9 @@ impl Editor {
if self.cursor.0 < self.buffer.newline_count() { if self.cursor.0 < self.buffer.newline_count() {
self.cursor.0 += 1; self.cursor.0 += 1;
} }
else {
self.cursor_to_end_of_buffer();
}
self.move_view_to_cursor(); self.move_view_to_cursor();
} }
@ -163,14 +177,16 @@ impl Editor {
self.cursor.0 -= self.view_pos.0; self.cursor.0 -= self.view_pos.0;
} }
else { else {
self.cursor = (0, 0); self.cursor_to_beginning_of_buffer();
} }
self.view_pos.0 = 0; self.view_pos.0 = 0;
} }
} }
else { else {
self.cursor = (0, 0); self.cursor_to_beginning_of_buffer();
} }
self.move_view_to_cursor();
} }
pub fn page_down(&mut self) { pub fn page_down(&mut self) {
@ -192,8 +208,10 @@ impl Editor {
self.cursor.0 += move_amount; self.cursor.0 += move_amount;
} }
else { else {
self.cursor = self.buffer.pos_1d_to_closest_2d(self.buffer.len()+1); self.cursor_to_end_of_buffer();
} }
} }
self.move_view_to_cursor();
} }
} }