Author SHA1 Message Date
Kenny Levinsen 6bb65c28c7 Minor bump 2019-09-07 00:39:10 +02:00
Kenny Levinsen 64ddb16147 rustfmt 2019-09-07 00:33:34 +02:00
Kenny Levinsen 1c02bfd339 clock: Sizing error 2019-09-07 00:33:24 +02:00
4 changed files with 6 additions and 6 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "wldash" name = "wldash"
version = "0.2.0" version = "0.2.1"
authors = ["Kenny Levinsen <kl@kl.wtf>"] authors = ["Kenny Levinsen <kl@kl.wtf>"]
edition = "2018" edition = "2018"
+1 -1
View File
@@ -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;
-1
View File
@@ -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();
+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),