From 0b5028b1ab47707a469176e9bf20cacdd3a19861 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 19 Apr 2020 14:39:30 +0200
Subject: Draft `Program` interactivity for `Canvas`

---
 wgpu/src/widget/canvas/drawable.rs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'wgpu/src/widget/canvas/drawable.rs')

diff --git a/wgpu/src/widget/canvas/drawable.rs b/wgpu/src/widget/canvas/drawable.rs
index 6c74071c..48ba6b4c 100644
--- a/wgpu/src/widget/canvas/drawable.rs
+++ b/wgpu/src/widget/canvas/drawable.rs
@@ -10,3 +10,9 @@ pub trait Drawable {
     /// [`Frame`]: struct.Frame.html
     fn draw(&self, frame: &mut Frame);
 }
+
+impl<'a> Drawable for dyn Fn(&mut Frame) + 'a {
+    fn draw(&self, frame: &mut Frame) {
+        self(frame)
+    }
+}
-- 
cgit 


From 592cc685067c36cbba87e4db14f4ebc71d65b951 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 19 Apr 2020 21:55:23 +0200
Subject: Remove `Layer` trait and simplify `Canvas`

---
 wgpu/src/widget/canvas/drawable.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'wgpu/src/widget/canvas/drawable.rs')

diff --git a/wgpu/src/widget/canvas/drawable.rs b/wgpu/src/widget/canvas/drawable.rs
index 48ba6b4c..32258b71 100644
--- a/wgpu/src/widget/canvas/drawable.rs
+++ b/wgpu/src/widget/canvas/drawable.rs
@@ -16,3 +16,12 @@ impl<'a> Drawable for dyn Fn(&mut Frame) + 'a {
         self(frame)
     }
 }
+
+impl<T> Drawable for &T
+where
+    T: Drawable,
+{
+    fn draw(&self, frame: &mut Frame) {
+        T::draw(self, frame)
+    }
+}
-- 
cgit 


From 2ca73036ab5946b451fd2b184541ae4dc6eedb24 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 28 Apr 2020 03:19:29 +0200
Subject: Implement `Drawable` for slices of drawables

---
 wgpu/src/widget/canvas/drawable.rs | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'wgpu/src/widget/canvas/drawable.rs')

diff --git a/wgpu/src/widget/canvas/drawable.rs b/wgpu/src/widget/canvas/drawable.rs
index 32258b71..5209fa6f 100644
--- a/wgpu/src/widget/canvas/drawable.rs
+++ b/wgpu/src/widget/canvas/drawable.rs
@@ -25,3 +25,12 @@ where
         T::draw(self, frame)
     }
 }
+
+impl<T> Drawable for &[T]
+where
+    T: Drawable,
+{
+    fn draw(&self, frame: &mut Frame) {
+        self.iter().for_each(|drawable| drawable.draw(frame));
+    }
+}
-- 
cgit 


From 2539042b71d70afd4d8f262783d441e768811ee9 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 28 Apr 2020 06:24:12 +0200
Subject: Remove `Drawable` and rename `State` to `Program`

---
 wgpu/src/widget/canvas/drawable.rs | 36 ------------------------------------
 1 file changed, 36 deletions(-)
 delete mode 100644 wgpu/src/widget/canvas/drawable.rs

(limited to 'wgpu/src/widget/canvas/drawable.rs')

diff --git a/wgpu/src/widget/canvas/drawable.rs b/wgpu/src/widget/canvas/drawable.rs
deleted file mode 100644
index 5209fa6f..00000000
--- a/wgpu/src/widget/canvas/drawable.rs
+++ /dev/null
@@ -1,36 +0,0 @@
-use crate::canvas::Frame;
-
-/// A type that can be drawn on a [`Frame`].
-///
-/// [`Frame`]: struct.Frame.html
-pub trait Drawable {
-    /// Draws the [`Drawable`] on the given [`Frame`].
-    ///
-    /// [`Drawable`]: trait.Drawable.html
-    /// [`Frame`]: struct.Frame.html
-    fn draw(&self, frame: &mut Frame);
-}
-
-impl<'a> Drawable for dyn Fn(&mut Frame) + 'a {
-    fn draw(&self, frame: &mut Frame) {
-        self(frame)
-    }
-}
-
-impl<T> Drawable for &T
-where
-    T: Drawable,
-{
-    fn draw(&self, frame: &mut Frame) {
-        T::draw(self, frame)
-    }
-}
-
-impl<T> Drawable for &[T]
-where
-    T: Drawable,
-{
-    fn draw(&self, frame: &mut Frame) {
-        self.iter().for_each(|drawable| drawable.draw(frame));
-    }
-}
-- 
cgit