reivilibre
/
iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve naming in `clock` example

This commit is contained in:
Héctor Ramón Jiménez 2020-02-12 22:13:59 +01:00
parent 9dc9305d93
commit e7c400a0aa
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
examples/clock/src/main.rs
View File

@ -42,7 +42,6 @@ impl Application for Clock {
if now != self.now { if now != self.now {
self.now = now; self.now = now;
self.clock.clear(); self.clock.clear();
} }
} }
@ -95,7 +94,7 @@ impl canvas::layer::Drawable for LocalTime {
let radius = frame.width().min(frame.height()) / 2.0; let radius = frame.width().min(frame.height()) / 2.0;
let offset = Vector::new(center.x, center.y); let offset = Vector::new(center.x, center.y);
let path = canvas::Path::new(|path| { let clock = canvas::Path::new(|path| {
path.arc(canvas::path::Arc { path.arc(canvas::path::Arc {
center, center,
radius, radius,
@ -105,11 +104,11 @@ impl canvas::layer::Drawable for LocalTime {
}); });
frame.fill( frame.fill(
&path, &clock,
canvas::Fill::Color(Color::from_rgb8(0x12, 0x93, 0xD8)), canvas::Fill::Color(Color::from_rgb8(0x12, 0x93, 0xD8)),
); );
fn draw_handle( fn draw_hand(
n: u32, n: u32,
total: u32, total: u32,
length: f32, length: f32,
@ -125,16 +124,16 @@ impl canvas::layer::Drawable for LocalTime {
path.line_to(Point::new(x, y) + offset); path.line_to(Point::new(x, y) + offset);
} }
let path = canvas::Path::new(|path| { let hour_and_minute_hands = canvas::Path::new(|path| {
path.move_to(center); path.move_to(center);
draw_handle(self.hour, 12, 0.5 * radius, offset, path); draw_hand(self.hour, 12, 0.5 * radius, offset, path);
path.move_to(center); path.move_to(center);
draw_handle(self.minute, 60, 0.8 * radius, offset, path) draw_hand(self.minute, 60, 0.8 * radius, offset, path)
}); });
frame.stroke( frame.stroke(
&path, &hour_and_minute_hands,
canvas::Stroke { canvas::Stroke {
width: 6.0, width: 6.0,
color: Color::WHITE, color: Color::WHITE,
@ -143,13 +142,13 @@ impl canvas::layer::Drawable for LocalTime {
}, },
); );
let path = canvas::Path::new(|path| { let second_hand = canvas::Path::new(|path| {
path.move_to(center); path.move_to(center);
draw_handle(self.second, 60, 0.8 * radius, offset, path) draw_hand(self.second, 60, 0.8 * radius, offset, path)
}); });
frame.stroke( frame.stroke(
&path, &second_hand,
canvas::Stroke { canvas::Stroke {
width: 3.0, width: 3.0,
color: Color::WHITE, color: Color::WHITE,