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/debugger.rs | 25 +++++++++++++++++++++++++
 native/src/renderer/windowed.rs | 17 +++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 native/src/renderer/debugger.rs
 create mode 100644 native/src/renderer/windowed.rs

(limited to 'native/src/renderer')

diff --git a/native/src/renderer/debugger.rs b/native/src/renderer/debugger.rs
new file mode 100644
index 00000000..cb472dd4
--- /dev/null
+++ b/native/src/renderer/debugger.rs
@@ -0,0 +1,25 @@
+use crate::{Color, Layout, Point, Widget};
+
+/// A renderer able to graphically explain a [`Layout`].
+///
+/// [`Layout`]: ../struct.Layout.html
+pub trait Debugger: super::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;
+}
diff --git a/native/src/renderer/windowed.rs b/native/src/renderer/windowed.rs
new file mode 100644
index 00000000..f89da40b
--- /dev/null
+++ b/native/src/renderer/windowed.rs
@@ -0,0 +1,17 @@
+use crate::MouseCursor;
+
+use raw_window_handle::HasRawWindowHandle;
+
+pub trait Windowed: super::Renderer {
+    type Target;
+
+    fn new<W: HasRawWindowHandle>(window: &W) -> Self;
+
+    fn target(&self, width: u16, height: u16) -> Self::Target;
+
+    fn draw(
+        &mut self,
+        target: &mut Self::Target,
+        primitive: &Self::Primitive,
+    ) -> MouseCursor;
+}
-- 
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/debugger.rs | 2 +-
 native/src/renderer/windowed.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'native/src/renderer')

diff --git a/native/src/renderer/debugger.rs b/native/src/renderer/debugger.rs
index cb472dd4..4cc50661 100644
--- a/native/src/renderer/debugger.rs
+++ b/native/src/renderer/debugger.rs
@@ -21,5 +21,5 @@ pub trait Debugger: super::Renderer {
         layout: Layout<'_>,
         cursor_position: Point,
         color: Color,
-    ) -> Self::Primitive;
+    ) -> Self::Output;
 }
diff --git a/native/src/renderer/windowed.rs b/native/src/renderer/windowed.rs
index f89da40b..bcf37964 100644
--- a/native/src/renderer/windowed.rs
+++ b/native/src/renderer/windowed.rs
@@ -11,7 +11,7 @@ pub trait Windowed: super::Renderer {
 
     fn draw(
         &mut self,
+        output: &Self::Output,
         target: &mut Self::Target,
-        primitive: &Self::Primitive,
     ) -> MouseCursor;
 }
-- 
cgit