From 03b34931383e701c39c653a7662a616fe21a0947 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 14 Oct 2021 16:07:22 +0700
Subject: Remove trait-specific draw logic in `iced_native`

---
 graphics/src/widget/row.rs | 46 +---------------------------------------------
 1 file changed, 1 insertion(+), 45 deletions(-)

(limited to 'graphics/src/widget/row.rs')

diff --git a/graphics/src/widget/row.rs b/graphics/src/widget/row.rs
index 397d80bf..55960c04 100644
--- a/graphics/src/widget/row.rs
+++ b/graphics/src/widget/row.rs
@@ -1,49 +1,5 @@
-use crate::{Backend, Primitive, Renderer};
-use iced_native::mouse;
-use iced_native::row;
-use iced_native::{Element, Layout, Point, Rectangle};
+use crate::Renderer;
 
 /// A container that distributes its contents horizontally.
 pub type Row<'a, Message, Backend> =
     iced_native::Row<'a, Message, Renderer<Backend>>;
-
-impl<B> row::Renderer for Renderer<B>
-where
-    B: Backend,
-{
-    fn draw<Message>(
-        &mut self,
-        defaults: &Self::Defaults,
-        content: &[Element<'_, Message, Self>],
-        layout: Layout<'_>,
-        cursor_position: Point,
-        viewport: &Rectangle,
-    ) -> Self::Output {
-        let mut mouse_interaction = mouse::Interaction::default();
-
-        (
-            Primitive::Group {
-                primitives: content
-                    .iter()
-                    .zip(layout.children())
-                    .map(|(child, layout)| {
-                        let (primitive, new_mouse_interaction) = child.draw(
-                            self,
-                            defaults,
-                            layout,
-                            cursor_position,
-                            viewport,
-                        );
-
-                        if new_mouse_interaction > mouse_interaction {
-                            mouse_interaction = new_mouse_interaction;
-                        }
-
-                        primitive
-                    })
-                    .collect(),
-            },
-            mouse_interaction,
-        )
-    }
-}
-- 
cgit 


From 0aafcde0ef1533c9eeba0379de8c0082e30c7504 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 31 Oct 2021 15:35:12 +0700
Subject: Remove `widget` module re-exports in `iced_native`

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

(limited to 'graphics/src/widget/row.rs')

diff --git a/graphics/src/widget/row.rs b/graphics/src/widget/row.rs
index 55960c04..5bee3fd5 100644
--- a/graphics/src/widget/row.rs
+++ b/graphics/src/widget/row.rs
@@ -2,4 +2,4 @@ use crate::Renderer;
 
 /// A container that distributes its contents horizontally.
 pub type Row<'a, Message, Backend> =
-    iced_native::Row<'a, Message, Renderer<Backend>>;
+    iced_native::widget::Row<'a, Message, Renderer<Backend>>;
-- 
cgit