clock: Sizing error

This commit is contained in:
Kenny Levinsen
2019-09-07 00:37:01 +02:00
parent d10883169f
commit 9908392af1
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -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;
-1
View File
@@ -107,7 +107,6 @@ fn main() {
config::OutputMode::Active => OutputMode::Active,
};
let background = config.background;
let (tx_draw, rx_draw) = channel();
+3 -2
View File
@@ -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<DrawReport, ::std::io::Error> {
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()