diff --git a/src/config.rs b/src/config.rs index 4aacc91..622744f 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,7 +1,7 @@ use crate::cmd::Cmd; +use crate::color::Color; use crate::widget; use crate::widgets; -use crate::color::Color; use serde::{Deserialize, Serialize}; use std::default::Default; use std::sync::mpsc::Sender; diff --git a/src/main.rs b/src/main.rs index 8216c52..e150ba1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -107,7 +107,6 @@ fn main() { config::OutputMode::Active => OutputMode::Active, }; - let background = config.background; let (tx_draw, rx_draw) = channel(); diff --git a/src/widgets/clock.rs b/src/widgets/clock.rs index 5da66d2..f38167b 100644 --- a/src/widgets/clock.rs +++ b/src/widgets/clock.rs @@ -46,7 +46,9 @@ impl Clock { impl Widget for Clock { fn size(&self) -> (u32, u32) { - ((2.0 * self.size).ceil() as u32, self.size.ceil() as u32) + let digit = (self.size * 0.45).ceil() as u32; + let colon = (self.size * 0.20).ceil() as u32; + (digit * 4 + colon, self.size.ceil() as u32) } fn draw( @@ -55,7 +57,6 @@ impl Widget for Clock { pos: (u32, u32), ) -> Result { let (width, height) = self.size(); - if !(ctx.time.date() != self.cur_time.date() || ctx.time.hour() != self.cur_time.hour() || ctx.time.minute() != self.cur_time.minute()