From a7d11944039a1b5ea5b72256e8d15367d99e6010 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 5 Oct 2019 03:56:18 +0200
Subject: Add `Renderer` and `Primitive` concepts

---
 native/src/renderer.rs | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'native/src/renderer.rs')

diff --git a/native/src/renderer.rs b/native/src/renderer.rs
index 2244f00b..d16a0289 100644
--- a/native/src/renderer.rs
+++ b/native/src/renderer.rs
@@ -17,12 +17,16 @@
 //! [`text::Renderer`]: ../widget/text/trait.Renderer.html
 //! [`Checkbox`]: ../widget/checkbox/struct.Checkbox.html
 //! [`checkbox::Renderer`]: ../widget/checkbox/trait.Renderer.html
-use crate::{Color, Layout};
+use crate::{Color, Layout, Point, Widget};
+
+pub trait Renderer {
+    type Primitive;
+}
 
 /// A renderer able to graphically explain a [`Layout`].
 ///
 /// [`Layout`]: ../struct.Layout.html
-pub trait Debugger {
+pub trait Debugger: Renderer {
     /// Explains the [`Layout`] of an [`Element`] for debugging purposes.
     ///
     /// This will be called when [`Element::explain`] has been used. It should
@@ -34,5 +38,11 @@ pub trait Debugger {
     /// [`Layout`]: struct.Layout.html
     /// [`Element`]: struct.Element.html
     /// [`Element::explain`]: struct.Element.html#method.explain
-    fn explain(&mut self, layout: &Layout<'_>, color: Color);
+    fn explain<Message>(
+        &mut self,
+        widget: &dyn Widget<Message, Self>,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        color: Color,
+    ) -> Self::Primitive;
 }
-- 
cgit 


From a92a0b73ed7ed935df762d06c4249894fd35b227 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 9 Oct 2019 05:36:49 +0200
Subject: Move `winit` logic from `iced` to `iced_winit`

- Added new `renderer::Windowed` trait. This shoud allow users to easily
  try different renderers by simply changing one line.
- Renamed `UserInterface` traits to `Application`, as the `run` method
  takes total control of the current thread.
- Moved `MouseCursor` back to `iced_native`. The new
  `renderer::Windowed` trait returns one on `draw`.
- Split `iced_native` renderer in multiple modules, for consistency.
---
 native/src/renderer.rs | 39 +++++++++++----------------------------
 1 file changed, 11 insertions(+), 28 deletions(-)

(limited to 'native/src/renderer.rs')

diff --git a/native/src/renderer.rs b/native/src/renderer.rs
index d16a0289..a56d7b76 100644
--- a/native/src/renderer.rs
+++ b/native/src/renderer.rs
@@ -1,8 +1,10 @@
 //! Write your own renderer.
 //!
-//! There is not a common entrypoint or trait for a __renderer__ in Iced.
-//! Instead, every [`Widget`] constrains its generic `Renderer` type as
-//! necessary.
+//! You will need to implement the `Renderer` trait first. It simply contains
+//! a `Primitive` associated type.
+//!
+//! There is no common trait to draw all the widgets. Instead, every [`Widget`]
+//! constrains its generic `Renderer` type as necessary.
 //!
 //! This approach is flexible and composable. For instance, the
 //! [`Text`] widget only needs a [`text::Renderer`] while a [`Checkbox`] widget
@@ -17,32 +19,13 @@
 //! [`text::Renderer`]: ../widget/text/trait.Renderer.html
 //! [`Checkbox`]: ../widget/checkbox/struct.Checkbox.html
 //! [`checkbox::Renderer`]: ../widget/checkbox/trait.Renderer.html
-use crate::{Color, Layout, Point, Widget};
+
+mod debugger;
+mod windowed;
+
+pub use debugger::Debugger;
+pub use windowed::Windowed;
 
 pub trait Renderer {
     type Primitive;
 }
-
-/// A renderer able to graphically explain a [`Layout`].
-///
-/// [`Layout`]: ../struct.Layout.html
-pub trait Debugger: Renderer {
-    /// Explains the [`Layout`] of an [`Element`] for debugging purposes.
-    ///
-    /// This will be called when [`Element::explain`] has been used. It should
-    /// _explain_ the given [`Layout`] graphically.
-    ///
-    /// A common approach consists in recursively rendering the bounds of the
-    /// [`Layout`] and its children.
-    ///
-    /// [`Layout`]: struct.Layout.html
-    /// [`Element`]: struct.Element.html
-    /// [`Element::explain`]: struct.Element.html#method.explain
-    fn explain<Message>(
-        &mut self,
-        widget: &dyn Widget<Message, Self>,
-        layout: Layout<'_>,
-        cursor_position: Point,
-        color: Color,
-    ) -> Self::Primitive;
-}
-- 
cgit 


From 8846a239cf14edd464b1d09f6d6d57ad9b5c9fc7 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 11 Oct 2019 22:15:39 +0200
Subject: Rename `Renderer::Primitive` to `Renderer::Output`

---
 native/src/renderer.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'native/src/renderer.rs')

diff --git a/native/src/renderer.rs b/native/src/renderer.rs
index a56d7b76..afe1b09a 100644
--- a/native/src/renderer.rs
+++ b/native/src/renderer.rs
@@ -1,7 +1,7 @@
 //! Write your own renderer.
 //!
 //! You will need to implement the `Renderer` trait first. It simply contains
-//! a `Primitive` associated type.
+//! an `Output` associated type.
 //!
 //! There is no common trait to draw all the widgets. Instead, every [`Widget`]
 //! constrains its generic `Renderer` type as necessary.
@@ -27,5 +27,5 @@ pub use debugger::Debugger;
 pub use windowed::Windowed;
 
 pub trait Renderer {
-    type Primitive;
+    type Output;
 }
-- 
cgit