bl/wldash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

clock: Sizing error

Browse Source
This commit is contained in:
Kenny Levinsen
2019-09-07 00:33:24 +02:00
parent d10883169f
commit 1c02bfd339
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/clock.rs
+4 -3
View File
@@ -46,7 +46,9 @@ impl Clock {
impl Widget for Clock { impl Widget for Clock {
fn size(&self) -> (u32, u32) { 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( fn draw(
@@ -55,7 +57,6 @@ impl Widget for Clock {
pos: (u32, u32), pos: (u32, u32),
) -> Result<DrawReport, ::std::io::Error> { ) -> Result<DrawReport, ::std::io::Error> {
let (width, height) = self.size(); let (width, height) = self.size();
if !(ctx.time.date() != self.cur_time.date() if !(ctx.time.date() != self.cur_time.date()
|| ctx.time.hour() != self.cur_time.hour() || ctx.time.hour() != self.cur_time.hour()
|| ctx.time.minute() != self.cur_time.minute() || 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 digit = (self.size * 0.45).ceil() as u32;
let colon = (self.size * 0.20).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, buf,
ctx.bg, ctx.bg,
&Color::new(1.0, 1.0, 1.0, 1.0), &Color::new(1.0, 1.0, 1.0, 1.0),