hasufell/neovim-gtk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix calculation error

Browse Source
This commit is contained in:
daa 2017-04-22 17:22:01 +03:00
parent 682660107a
commit ee0af91043
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/ui_model.rs
View File

@ -218,7 +218,7 @@ impl UiModel {
let (cur_row, cur_col, columns) = (self.cur_row, self.cur_col, self.columns); let (cur_row, cur_col, columns) = (self.cur_row, self.cur_col, self.columns);
self.clear_region(cur_row, cur_row, cur_col, columns - 1); self.clear_region(cur_row, cur_row, cur_col, columns - 1);
ModelRect::new(cur_row, cur_col, cur_col, columns - 1) ModelRect::new(cur_row, cur_row, cur_col, columns - 1)
} }
fn clear_region(&mut self, top: usize, bot: usize, left: usize, right: usize) { fn clear_region(&mut self, top: usize, bot: usize, left: usize, right: usize) {
@ -275,6 +275,9 @@ pub struct ModelRect {
impl ModelRect { impl ModelRect {
pub fn new(top: usize, bot: usize, left: usize, right: usize) -> ModelRect { pub fn new(top: usize, bot: usize, left: usize, right: usize) -> ModelRect {
debug_assert!(top <= bot);
debug_assert!(left <= right);
ModelRect { ModelRect {
top: top, top: top,
bot: bot, bot: bot,
@ -337,6 +340,9 @@ impl ModelRect {
} else { } else {
rect.right rect.right
}; };
debug_assert!(self.top <= self.bot);
debug_assert!(self.left <= self.right);
} }
pub fn to_area(&self, line_height: f64, char_width: f64) -> (i32, i32, i32, i32) { pub fn to_area(&self, line_height: f64, char_width: f64) -> (i32, i32, i32, i32) {
@ -562,12 +568,12 @@ mod tests {
fn test_eol_clear_area() { fn test_eol_clear_area() {
let mut model = UiModel::new(10, 20); let mut model = UiModel::new(10, 20);
model.set_cursor(1, 1); model.set_cursor(1, 2);
let rect = model.eol_clear(); let rect = model.eol_clear();
assert_eq!(1, rect.top); assert_eq!(1, rect.top);
assert_eq!(1, rect.left); assert_eq!(2, rect.left);
assert_eq!(1, rect.bot); assert_eq!(1, rect.bot);
assert_eq!(19, rect.right); assert_eq!(19, rect.right);
} }