aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2021-11-20 18:55:34 -0500
committerJesse Luehrs <doy@tozt.net>2021-11-20 18:55:34 -0500
commit26cacf15952793ad870e315c4291deee67808b0a (patch)
tree73263112165b76d8711ead78104633ad0c54c6df /src
parent87f5c5b59cdb2fdb4bd772f97c8896e7cba4e9fc (diff)
downloadvt100-rust-26cacf15952793ad870e315c4291deee67808b0a.tar.gz
vt100-rust-26cacf15952793ad870e315c4291deee67808b0a.zip
more wrapping bugs
Diffstat (limited to 'src')
-rw-r--r--src/grid.rs1
-rw-r--r--src/row.rs3
2 files changed, 2 insertions, 2 deletions
diff --git a/src/grid.rs b/src/grid.rs
index d2eafff..173910a 100644
--- a/src/grid.rs
+++ b/src/grid.rs
@@ -473,7 +473,6 @@ impl Grid {
let pos = self.pos;
let row = self.current_row_mut();
for col in pos.col..((pos.col + count).min(size.cols)) {
- row.clear_wide(col);
row.erase(col as usize, attrs);
}
}
diff --git a/src/row.rs b/src/row.rs
index 7347568..b15266e 100644
--- a/src/row.rs
+++ b/src/row.rs
@@ -49,9 +49,10 @@ impl Row {
}
pub fn erase(&mut self, i: usize, attrs: crate::attrs::Attrs) {
+ let wide = self.cells.get_mut(i).unwrap().is_wide();
self.clear_wide(i.try_into().unwrap());
self.cells.get_mut(i).unwrap().clear(attrs);
- if i == self.cols() as usize - 1 {
+ if i == self.cols() as usize - if wide { 2 } else { 1 } {
self.wrapped = false;
}
}