From 5a5ca34b5fcab9266359d3f0885782969f8c058e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 5 Oct 2019 19:22:51 +0200
Subject: Modularize `iced_wgpu`

---
 wgpu/src/renderer/row.rs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 wgpu/src/renderer/row.rs

(limited to 'wgpu/src/renderer/row.rs')

diff --git a/wgpu/src/renderer/row.rs b/wgpu/src/renderer/row.rs
new file mode 100644
index 00000000..be9e4ede
--- /dev/null
+++ b/wgpu/src/renderer/row.rs
@@ -0,0 +1,22 @@
+use crate::{Primitive, Renderer};
+use iced_native::{row, Layout, Point, Row};
+
+impl row::Renderer for Renderer {
+    fn draw<Message>(
+        &mut self,
+        row: &Row<'_, Message, Self>,
+        layout: Layout<'_>,
+        cursor_position: Point,
+    ) -> Self::Primitive {
+        Primitive::Group {
+            primitives: row
+                .children
+                .iter()
+                .zip(layout.children())
+                .map(|(child, layout)| {
+                    child.draw(self, layout, cursor_position)
+                })
+                .collect(),
+        }
+    }
+}
-- 
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`

---
 wgpu/src/renderer/row.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wgpu/src/renderer/row.rs')

diff --git a/wgpu/src/renderer/row.rs b/wgpu/src/renderer/row.rs
index be9e4ede..b6baf61f 100644
--- a/wgpu/src/renderer/row.rs
+++ b/wgpu/src/renderer/row.rs
@@ -7,7 +7,7 @@ impl row::Renderer for Renderer {
         row: &Row<'_, Message, Self>,
         layout: Layout<'_>,
         cursor_position: Point,
-    ) -> Self::Primitive {
+    ) -> Self::Output {
         Primitive::Group {
             primitives: row
                 .children
-- 
cgit 


From a031a6f2130b3913a2419e4cea859c22aa388213 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 11 Oct 2019 23:30:53 +0200
Subject: Handle mouse cursor in `iced_wgpu`

---
 wgpu/src/renderer/row.rs | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

(limited to 'wgpu/src/renderer/row.rs')

diff --git a/wgpu/src/renderer/row.rs b/wgpu/src/renderer/row.rs
index b6baf61f..bbfef9a1 100644
--- a/wgpu/src/renderer/row.rs
+++ b/wgpu/src/renderer/row.rs
@@ -1,5 +1,5 @@
 use crate::{Primitive, Renderer};
-use iced_native::{row, Layout, Point, Row};
+use iced_native::{row, Layout, MouseCursor, Point, Row};
 
 impl row::Renderer for Renderer {
     fn draw<Message>(
@@ -8,15 +8,27 @@ impl row::Renderer for Renderer {
         layout: Layout<'_>,
         cursor_position: Point,
     ) -> Self::Output {
-        Primitive::Group {
-            primitives: row
-                .children
-                .iter()
-                .zip(layout.children())
-                .map(|(child, layout)| {
-                    child.draw(self, layout, cursor_position)
-                })
-                .collect(),
-        }
+        let mut mouse_cursor = MouseCursor::OutOfBounds;
+
+        (
+            Primitive::Group {
+                primitives: row
+                    .children
+                    .iter()
+                    .zip(layout.children())
+                    .map(|(child, layout)| {
+                        let (primitive, new_mouse_cursor) =
+                            child.draw(self, layout, cursor_position);
+
+                        if new_mouse_cursor > mouse_cursor {
+                            mouse_cursor = new_mouse_cursor;
+                        }
+
+                        primitive
+                    })
+                    .collect(),
+            },
+            mouse_cursor,
+        )
     }
 }
-- 
cgit