summaryrefslogtreecommitdiffstats
path: root/src/widget.rs
diff options
context:
space:
mode:
authorrabite <rabite@posteo.de>2019-03-30 22:18:50 +0100
committerrabite <rabite@posteo.de>2019-03-30 22:28:10 +0100
commited6abefc3c4876bc1ea7dade58909fc161706b60 (patch)
tree5a09868e1dc8872a63b57c623505c1d95d0f02bb /src/widget.rs
parent4658b2fcf00b00aed642d1af24c7f763d3613cba (diff)
some bugs fixed
Diffstat (limited to 'src/widget.rs')
-rw-r--r--src/widget.rs16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/widget.rs b/src/widget.rs
index a58b0c7..4f400c6 100644
--- a/src/widget.rs
+++ b/src/widget.rs
@@ -164,7 +164,7 @@ pub trait Widget {
}
fn bad(&mut self, event: Event) -> HResult<()> {
- self.show_status(&format!("Stop the nasty stuff!! {:?} does nothing!", event))
+ self.show_status(&format!("Stop it!! {:?} does nothing!", event))
}
fn get_header_drawlist(&mut self) -> HResult<String> {
@@ -356,33 +356,29 @@ pub trait Widget {
}
fn draw_status(&self) -> HResult<()> {
- let xsize = term::xsize() as u16;
+ let xsize = term::xsize_u();
let status = match self.get_core()?.status_bar_content.lock()?.as_ref() {
Some(status) => status.to_string(),
None => "".to_string(),
};
+ let sized_status = term::sized_string_u(&status, xsize);
self.write_to_screen(
&format!(
- "{}{}{:xsize$}{}{}",
+ "{}{}{}",
term::move_bottom(),
term::status_bg(),
- " ",
- term::move_bottom(),
- status,
- xsize = xsize as usize
+ sized_status
)).log();
Ok(())
}
fn show_status(&self, status: &str) -> HResult<()> {
- let xsize = self.get_core()?.coordinates.xsize_u();
- let sized_status = term::sized_string_u(status, xsize);
HError::log::<()>(status.to_string()).log();
{
let mut status_content = self.get_core()?.status_bar_content.lock()?;
- *status_content = Some(sized_status);
+ *status_content = Some(status.to_string());
}
self.draw_status()?;
Ok(())