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

Still bugs

This commit is contained in:
Thomas Forgione 2023-10-25 16:56:15 +02:00
parent c5d563bea1
commit 45cda094ef
1 changed files with 30 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/tile.rs
View File

@ -346,7 +346,6 @@ impl Tile {
let mut line_index = 0; let mut line_index = 0;
let mut last_line_index = 0; let mut last_line_index = 0;
let mut old_current_char_index = 0;
let mut current_char_index = 0; let mut current_char_index = 0;
let mut max_char_index = 0; let mut max_char_index = 0;
let scroll = self.scroll as u16; let scroll = self.scroll as u16;
@ -378,33 +377,53 @@ 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 {
let mut spaces = String::new();
for _ in current_char_index..w {
spaces.push(DELETE_CHAR);
}
buffer.push(format!(
"{}{}{}",
cursor::Goto(
x + current_char_index,
y + line_index as u16 - scroll
),
spaces,
cursor::Goto(
x + current_char_index,
y + line_index as u16 - scroll
),
));
}
}
}
_ => buffer.push(subbuffer), _ => buffer.push(subbuffer),
} }
continue; continue;
} }
if line_index >= scroll && line_index <= h + scroll {
old_current_char_index = current_char_index;
}
match c { match c {
'\n' => { '\n' => {
line_index += 1; line_index += 1;
current_char_index = 0; current_char_index = 0;
if line_index >= scroll && line_index <= h + scroll { if line_index >= scroll && line_index <= h + scroll {
max_char_index = 0; if max_char_index < w {
let mut spaces = format!(
if old_current_char_index < w { "{}",
let mut spaces = String::new(); cursor::Goto(x + max_char_index, y + line_index as u16 - scroll)
for _ in old_current_char_index..w { );
for _ in max_char_index..w {
spaces.push(DELETE_CHAR); spaces.push(DELETE_CHAR);
} }
buffer.push(spaces); buffer.push(spaces);
} }
max_char_index = 0;
buffer.push(format!( buffer.push(format!(
"{}", "{}",
cursor::Goto(x, y + line_index as u16 - scroll) cursor::Goto(x, y + line_index as u16 - scroll)
@ -452,13 +471,6 @@ impl Tile {
} }
} }
// I don't know how to clear this correctly :'(
// let index = if last_char == '\n' {
// old_current_char_index
// } else {
// max_char_index;
// };
let mut spaces = format!( let mut spaces = format!(
"{}", "{}",
cursor::Goto(x + max_char_index, y + last_line_index as u16 - scroll) cursor::Goto(x + max_char_index, y + last_line_index as u16 - scroll)