tforgione
/
multiview
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove useless conditions

This commit is contained in:
Thomas Forgione 2023-10-25 21:42:36 +02:00
parent 75f4e69949
commit 7c77ce4179
1 changed files with 50 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/tile.rs
View File

@ -265,7 +265,6 @@ impl Tile {
} }
_ => { _ => {
// TODO fix utf8
self.stdout.last_mut().unwrap().push(c); self.stdout.last_mut().unwrap().push(c);
if self.counting { if self.counting {
@ -407,7 +406,6 @@ impl Tile {
match &subbuffer[0..3] { match &subbuffer[0..3] {
"\x1b[K" => { "\x1b[K" => {
if line_index >= scroll && line_index <= h + scroll {
if current_char_index < w { if current_char_index < w {
let mut spaces = String::new(); let mut spaces = String::new();
for _ in current_char_index..w { for _ in current_char_index..w {
@ -427,7 +425,6 @@ impl Tile {
)); ));
} }
} }
}
_ => buffer.push(subbuffer), _ => buffer.push(subbuffer),
} }
@ -439,8 +436,6 @@ impl Tile {
line_index += 1; line_index += 1;
current_char_index = 0; current_char_index = 0;
if line_index >= scroll && line_index <= h + scroll {
if max_char_index < w {
let mut spaces = format!( let mut spaces = format!(
"{}", "{}",
cursor::Goto(x + max_char_index, y + line_index as u16 - scroll) cursor::Goto(x + max_char_index, y + line_index as u16 - scroll)
@ -449,7 +444,6 @@ impl Tile {
spaces.push(DELETE_CHAR); spaces.push(DELETE_CHAR);
} }
buffer.push(spaces); buffer.push(spaces);
}
max_char_index = 0; max_char_index = 0;
@ -460,11 +454,9 @@ impl Tile {
last_line_index = line_index; last_line_index = line_index;
} }
}
'\r' => { '\r' => {
current_char_index = 0; current_char_index = 0;
if line_index >= scroll && line_index <= h + scroll {
buffer.push(format!( buffer.push(format!(
"{}", "{}",
cursor::Goto(x, y + line_index as u16 - scroll) cursor::Goto(x, y + line_index as u16 - scroll)
@ -472,10 +464,8 @@ impl Tile {
last_line_index = line_index; last_line_index = line_index;
} }
}
_ => { _ => {
if line_index >= scroll && line_index <= h + scroll {
current_char_index += 1; current_char_index += 1;
max_char_index = std::cmp::max(max_char_index, current_char_index); max_char_index = std::cmp::max(max_char_index, current_char_index);
@ -484,7 +474,6 @@ impl Tile {
current_char_index = 1; current_char_index = 1;
max_char_index = 1; max_char_index = 1;
if line_index >= scroll && line_index <= h + scroll {
buffer.push(format!( buffer.push(format!(
"{}", "{}",
cursor::Goto(x, y + line_index as u16 - scroll) cursor::Goto(x, y + line_index as u16 - scroll)
@ -492,13 +481,11 @@ impl Tile {
last_line_index = line_index; last_line_index = line_index;
} }
}
buffer.push(format!("{}", c)); buffer.push(format!("{}", c));
} }
} }
} }
}
let mut spaces = format!( let mut spaces = format!(
"{}", "{}",