From 7c5809e747b52b6d0f1c207e2e138618b075457e Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Tue, 14 Dec 2021 03:09:25 -0500 Subject: remove unnecessary condition we already wrapped (by calling col_wrap) so pos.col will always be less than size.cols --- src/screen.rs | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/src/screen.rs b/src/screen.rs index 08e0161..6c3d629 100644 --- a/src/screen.rs +++ b/src/screen.rs @@ -879,37 +879,28 @@ impl Screen { } } } else { - let drawing_pos = if pos.col < size.cols { - pos - } else { - crate::grid::Pos { - row: pos.row + 1, - col: 0, - } - }; - if self .grid() - .drawing_cell(drawing_pos) + .drawing_cell(pos) .unwrap() .is_wide_continuation() { let prev_cell = self .grid_mut() .drawing_cell_mut(crate::grid::Pos { - row: drawing_pos.row, - col: drawing_pos.col - 1, + row: pos.row, + col: pos.col - 1, }) .unwrap(); prev_cell.clear(attrs); } - if self.grid().drawing_cell(drawing_pos).unwrap().is_wide() { + if self.grid().drawing_cell(pos).unwrap().is_wide() { let next_cell = self .grid_mut() .drawing_cell_mut(crate::grid::Pos { - row: drawing_pos.row, - col: drawing_pos.col + 1, + row: pos.row, + col: pos.col + 1, }) .unwrap(); next_cell.set(' ', attrs); -- cgit v1.2.3-54-g00ecf