Remove `Drawable` and rename `State` to `Program`

2 files changed, 42 insertions, 59 deletions

diff --git a/examples/clock/Cargo.toml b/examples/clock/Cargo.toml
index 308cbfbb..ab771405 100644
--- a/examples/clock/Cargo.toml
+++ b/examples/clock/Cargo.toml
@@ -5,9 +5,6 @@ authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2018"
 publish = false
 
-[features]
-canvas = []
-
 [dependencies]
 iced = { path = "../..", features = ["canvas", "async-std", "debug"] }
 iced_native = { path = "../../native" }
diff --git a/examples/clock/src/main.rs b/examples/clock/src/main.rs
index 8b3a92c7..c2beddef 100644
--- a/examples/clock/src/main.rs
+++ b/examples/clock/src/main.rs
@@ -1,6 +1,7 @@
 use iced::{
-    canvas, executor, Application, Canvas, Color, Command, Container, Element,
-    Length, Point, Settings, Subscription, Vector,
+    canvas::{self, Cache, Canvas, Geometry, LineCap, Path, Stroke},
+    executor, Application, Color, Command, Container, Element, Length, Point,
+    Settings, Size, Subscription, Vector,
 };
 
 pub fn main() {
@@ -11,8 +12,8 @@ pub fn main() {
 }
 
 struct Clock {
-    now: LocalTime,
-    clock: canvas::Cache,
+    now: chrono::DateTime<chrono::Local>,
+    clock: Cache,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -28,7 +29,7 @@ impl Application for Clock {
     fn new(_flags: ()) -> (Self, Command<Message>) {
         (
             Clock {
-                now: chrono::Local::now().into(),
+                now: chrono::Local::now(),
                 clock: Default::default(),
             },
             Command::none(),
@@ -59,7 +60,7 @@ impl Application for Clock {
     }
 
     fn view(&mut self) -> Element<Message> {
-        let canvas = Canvas::new(self.clock.with(&self.now))
+        let canvas = Canvas::new(self)
             .width(Length::Units(400))
             .height(Length::Units(400));
 
@@ -73,69 +74,54 @@ impl Application for Clock {
     }
 }
 
-#[derive(Debug, PartialEq, Eq)]
-struct LocalTime {
-    hour: u32,
-    minute: u32,
-    second: u32,
-}
-
-impl From<chrono::DateTime<chrono::Local>> for LocalTime {
-    fn from(date_time: chrono::DateTime<chrono::Local>) -> LocalTime {
+impl canvas::Program<Message> for Clock {
+    fn draw(&self, bounds: Size) -> Vec<Geometry> {
         use chrono::Timelike;
 
-        LocalTime {
-            hour: date_time.hour(),
-            minute: date_time.minute(),
-            second: date_time.second(),
-        }
-    }
-}
-
-impl canvas::Drawable for LocalTime {
-    fn draw(&self, frame: &mut canvas::Frame) {
-        use canvas::Path;
+        let clock = self.clock.draw(bounds, |frame| {
+            let center = frame.center();
+            let radius = frame.width().min(frame.height()) / 2.0;
 
-        let center = frame.center();
-        let radius = frame.width().min(frame.height()) / 2.0;
+            let background = Path::circle(center, radius);
+            frame.fill(&background, Color::from_rgb8(0x12, 0x93, 0xD8));
 
-        let clock = Path::circle(center, radius);
-        frame.fill(&clock, Color::from_rgb8(0x12, 0x93, 0xD8));
+            let short_hand =
+                Path::line(Point::ORIGIN, Point::new(0.0, -0.5 * radius));
 
-        let short_hand =
-            Path::line(Point::ORIGIN, Point::new(0.0, -0.5 * radius));
+            let long_hand =
+                Path::line(Point::ORIGIN, Point::new(0.0, -0.8 * radius));
 
-        let long_hand =
-            Path::line(Point::ORIGIN, Point::new(0.0, -0.8 * radius));
+            let thin_stroke = Stroke {
+                width: radius / 100.0,
+                color: Color::WHITE,
+                line_cap: LineCap::Round,
+                ..Stroke::default()
+            };
 
-        let thin_stroke = canvas::Stroke {
-            width: radius / 100.0,
-            color: Color::WHITE,
-            line_cap: canvas::LineCap::Round,
-            ..canvas::Stroke::default()
-        };
+            let wide_stroke = Stroke {
+                width: thin_stroke.width * 3.0,
+                ..thin_stroke
+            };
 
-        let wide_stroke = canvas::Stroke {
-            width: thin_stroke.width * 3.0,
-            ..thin_stroke
-        };
+            frame.translate(Vector::new(center.x, center.y));
 
-        frame.translate(Vector::new(center.x, center.y));
+            frame.with_save(|frame| {
+                frame.rotate(hand_rotation(self.now.hour(), 12));
+                frame.stroke(&short_hand, wide_stroke);
+            });
 
-        frame.with_save(|frame| {
-            frame.rotate(hand_rotation(self.hour, 12));
-            frame.stroke(&short_hand, wide_stroke);
-        });
+            frame.with_save(|frame| {
+                frame.rotate(hand_rotation(self.now.minute(), 60));
+                frame.stroke(&long_hand, wide_stroke);
+            });
 
-        frame.with_save(|frame| {
-            frame.rotate(hand_rotation(self.minute, 60));
-            frame.stroke(&long_hand, wide_stroke);
+            frame.with_save(|frame| {
+                frame.rotate(hand_rotation(self.now.second(), 60));
+                frame.stroke(&long_hand, thin_stroke);
+            })
         });
 
-        frame.with_save(|frame| {
-            frame.rotate(hand_rotation(self.second, 60));
-            frame.stroke(&long_hand, thin_stroke);
-        });
+        vec![clock]
     }
 }