extrawurst/gitui
1
1
Fork 0
mirror of https://github.com/extrawurst/gitui.git synced 2024-11-22 19:29:14 +03:00
Code Issues Projects Releases Wiki Activity

fix spinner drawing if char didn't change (#764)

Browse Source
This commit is contained in:
Stephan Dilly 2021-06-06 02:09:40 +02:00
parent 5320d0ee0b
commit bfc732451a
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/spinner.rs
View File

@ -1,5 +1,5 @@
use std::io;
use tui::{backend::Backend, buffer::Cell, Terminal};
use std::{cell::Cell, char, io};
use tui::{backend::Backend, Terminal};
// static SPINNER_CHARS: &[char] = &['◢', '◣', '◤', '◥'];
// static SPINNER_CHARS: &[char] = &['⢹', '⢺', '⢼', '⣸', '⣇', '⡧', '⡗', '⡏'];
@ -7,10 +7,20 @@ static SPINNER_CHARS: &[char] =
&['⣷', '⣯', '⣟', '⡿', '⢿', '⣻', '⣽', '⣾'];
///
#[derive(Default)]
pub struct Spinner {
idx: usize,
pending: bool,
active: bool,
last_char: Cell<char>,
}
impl Default for Spinner {
fn default() -> Self {
Self {
idx: 0,
active: false,
last_char: Cell::new(' '),
}
}
}
impl Spinner {
@ -21,8 +31,8 @@ impl Spinner {
}
///
pub fn set_state(&mut self, pending: bool) {
self.pending = pending;
pub fn set_state(&mut self, active: bool) {
self.active = active;
}
/// draws or removes spinner char depending on `pending` state
@ -32,17 +42,22 @@ impl Spinner {
) -> io::Result<()> {
let idx = self.idx;
let c: Cell = Cell::default()
.set_char(if self.pending {
SPINNER_CHARS[idx]
} else {
' '
})
.clone();
terminal
.backend_mut()
.draw(vec![(0_u16, 0_u16, &c)].into_iter())?;
tui::backend::Backend::flush(terminal.backend_mut())?;
let char_to_draw =
if self.active { SPINNER_CHARS[idx] } else { ' ' };
if self.last_char.get() != char_to_draw {
self.last_char.set(char_to_draw);
let c = tui::buffer::Cell::default()
.set_char(char_to_draw)
.clone();
terminal
.backend_mut()
.draw(vec![(0_u16, 0_u16, &c)].into_iter())?;
tui::backend::Backend::flush(terminal.backend_mut())?;
}
Ok(())
}