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

Fixed line wrapping cursor nav.

Browse Source
This commit is contained in:
Nathan Vegdahl 2015-01-27 22:44:01 -08:00
parent 04816ebe84
commit 40bf2460a9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/term_ui/formatter.rs
View File

@ -66,14 +66,14 @@ impl<'a> LineFormatter for ConsoleLineFormatter {
fn index_to_v2d(&self, line: &Line, index: usize) -> (usize, usize) { fn index_to_v2d(&self, line: &Line, index: usize) -> (usize, usize) {
let mut pos = (0, 0); let mut pos = (0, 0);
let mut iter = self.vis_grapheme_iter(line); let mut i = 0;
for _ in range(0, index) { for (_, _pos, _) in self.vis_grapheme_iter(line) {
if let Some((_, _pos, _)) = iter.next() { pos = _pos;
pos = _pos; i += 1;
}
else { if i > index {
panic!("ConsoleLineFormatter::index_to_v2d(): index past end of line."); break;
} }
} }
@ -85,11 +85,11 @@ impl<'a> LineFormatter for ConsoleLineFormatter {
// TODO: handle rounding modes // TODO: handle rounding modes
let mut i = 0; let mut i = 0;
for (_, pos, width) in self.vis_grapheme_iter(line) { for (_, pos, _) in self.vis_grapheme_iter(line) {
if pos.0 > v2d.0 { if pos.0 > v2d.0 {
break; break;
} }
else if pos.0 == v2d.0 && pos.1 > v2d.1 { else if pos.0 == v2d.0 && pos.1 >= v2d.1 {
break; break;
} }