clock: Sizing error
This commit is contained in:
+1
-1
@@ -1,7 +1,7 @@
|
|||||||
use crate::cmd::Cmd;
|
use crate::cmd::Cmd;
|
||||||
|
use crate::color::Color;
|
||||||
use crate::widget;
|
use crate::widget;
|
||||||
use crate::widgets;
|
use crate::widgets;
|
||||||
use crate::color::Color;
|
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::default::Default;
|
use std::default::Default;
|
||||||
use std::sync::mpsc::Sender;
|
use std::sync::mpsc::Sender;
|
||||||
|
|||||||
@@ -107,7 +107,6 @@ fn main() {
|
|||||||
config::OutputMode::Active => OutputMode::Active,
|
config::OutputMode::Active => OutputMode::Active,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
let background = config.background;
|
let background = config.background;
|
||||||
|
|
||||||
let (tx_draw, rx_draw) = channel();
|
let (tx_draw, rx_draw) = channel();
|
||||||
|
|||||||
@@ -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()
|
||||||
|
|||||||
Reference in New Issue
Block a user