From 1c02bfd339d3ae96ebf949cbb5234e73071cf2ef Mon Sep 17 00:00:00 2001 From: Kenny Levinsen Date: Sat, 7 Sep 2019 00:33:24 +0200 Subject: [PATCH] clock: Sizing error --- src/widgets/clock.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/widgets/clock.rs b/src/widgets/clock.rs index 5da66d2..7acf9c7 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() @@ -71,7 +72,7 @@ impl Widget for Clock { let digit = (self.size * 0.45).ceil() as u32; let colon = (self.size * 0.20).ceil() as u32; - self.clock_cache.draw_text_fixed_width( + let dim = self.clock_cache.draw_text_fixed_width( buf, ctx.bg, &Color::new(1.0, 1.0, 1.0, 1.0),