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`

---
 native/src/overlay/element.rs |  4 +--
 native/src/overlay/menu.rs    | 79 ++++++++++++-------------------------------
 2 files changed, 24 insertions(+), 59 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index e4819037..081b62ce 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -74,7 +74,7 @@ where
         defaults: &Renderer::Defaults,
         layout: Layout<'_>,
         cursor_position: Point,
-    ) -> Renderer::Output {
+    ) {
         self.overlay
             .draw(renderer, defaults, layout, cursor_position)
     }
@@ -145,7 +145,7 @@ where
         defaults: &Renderer::Defaults,
         layout: Layout<'_>,
         cursor_position: Point,
-    ) -> Renderer::Output {
+    ) {
         self.content
             .draw(renderer, defaults, layout, cursor_position)
     }
diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index f62dcb46..f90a9f7b 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -239,21 +239,22 @@ where
         defaults: &Renderer::Defaults,
         layout: Layout<'_>,
         cursor_position: Point,
-    ) -> Renderer::Output {
-        let primitives = self.container.draw(
-            renderer,
-            defaults,
-            layout,
-            cursor_position,
-            &layout.bounds(),
-        );
-
-        renderer.decorate(
-            layout.bounds(),
-            cursor_position,
-            &self.style,
-            primitives,
-        )
+    ) {
+        // TODO
+        // let primitives = self.container.draw(
+        //     renderer,
+        //     defaults,
+        //     layout,
+        //     cursor_position,
+        //     &layout.bounds(),
+        // );
+
+        // renderer.decorate(
+        //     layout.bounds(),
+        //     cursor_position,
+        //     &self.style,
+        //     primitives,
+        // )
     }
 }
 
@@ -378,24 +379,13 @@ where
 
     fn draw(
         &self,
-        renderer: &mut Renderer,
+        _renderer: &mut Renderer,
         _defaults: &Renderer::Defaults,
-        layout: Layout<'_>,
-        cursor_position: Point,
-        viewport: &Rectangle,
-    ) -> Renderer::Output {
-        self::Renderer::draw(
-            renderer,
-            layout.bounds(),
-            cursor_position,
-            viewport,
-            self.options,
-            *self.hovered_option,
-            self.padding,
-            self.text_size.unwrap_or(renderer.default_size()),
-            self.font,
-            &self.style,
-        )
+        _layout: Layout<'_>,
+        _cursor_position: Point,
+        _viewport: &Rectangle,
+    ) {
+        // TODO
     }
 }
 
@@ -410,31 +400,6 @@ pub trait Renderer:
 {
     /// The [`Menu`] style supported by this renderer.
     type Style: Default + Clone;
-
-    /// Decorates a the list of options of a [`Menu`].
-    ///
-    /// This method can be used to draw a background for the [`Menu`].
-    fn decorate(
-        &mut self,
-        bounds: Rectangle,
-        cursor_position: Point,
-        style: &<Self as Renderer>::Style,
-        primitive: Self::Output,
-    ) -> Self::Output;
-
-    /// Draws the list of options of a [`Menu`].
-    fn draw<T: ToString>(
-        &mut self,
-        bounds: Rectangle,
-        cursor_position: Point,
-        viewport: &Rectangle,
-        options: &[T],
-        hovered_option: Option<usize>,
-        padding: Padding,
-        text_size: u16,
-        font: Self::Font,
-        style: &<Self as Renderer>::Style,
-    ) -> Self::Output;
 }
 
 impl<'a, T, Message, Renderer> Into<Element<'a, Message, Renderer>>
-- 
cgit 


From 54a9a232f8110364972a8eef966b7b7477573f4f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 18 Oct 2021 14:48:33 +0700
Subject: Draw scrollbar in `Widget::draw` for `Scrollable`

---
 native/src/overlay/menu.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index f90a9f7b..c4f64f85 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -395,9 +395,7 @@ where
 /// able to use a [`Menu`] in your user interface.
 ///
 /// [renderer]: crate::renderer
-pub trait Renderer:
-    scrollable::Renderer + container::Renderer + text::Renderer
-{
+pub trait Renderer: container::Renderer + text::Renderer {
     /// The [`Menu`] style supported by this renderer.
     type Style: Default + Clone;
 }
-- 
cgit 


From edea093350e1b576e2b7db50c525e7fa5c3bea9f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 18 Oct 2021 15:19:04 +0700
Subject: Move `Defaults` from `iced_graphics` to `iced_native`

---
 native/src/overlay/element.rs | 11 +++++------
 native/src/overlay/menu.rs    |  5 +++--
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index 081b62ce..bf3fb3f0 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -2,6 +2,7 @@ pub use crate::Overlay;
 
 use crate::event::{self, Event};
 use crate::layout;
+use crate::renderer;
 use crate::{Clipboard, Hasher, Layout, Point, Size, Vector};
 
 /// A generic [`Overlay`].
@@ -71,12 +72,11 @@ where
     pub fn draw(
         &self,
         renderer: &mut Renderer,
-        defaults: &Renderer::Defaults,
+        style: &renderer::Style,
         layout: Layout<'_>,
         cursor_position: Point,
     ) {
-        self.overlay
-            .draw(renderer, defaults, layout, cursor_position)
+        self.overlay.draw(renderer, style, layout, cursor_position)
     }
 
     /// Computes the _layout_ hash of the [`Element`].
@@ -142,12 +142,11 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        defaults: &Renderer::Defaults,
+        style: &renderer::Style,
         layout: Layout<'_>,
         cursor_position: Point,
     ) {
-        self.content
-            .draw(renderer, defaults, layout, cursor_position)
+        self.content.draw(renderer, style, layout, cursor_position)
     }
 
     fn hash_layout(&self, state: &mut Hasher, position: Point) {
diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index c4f64f85..f2367ae7 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -4,6 +4,7 @@ use crate::event::{self, Event};
 use crate::layout;
 use crate::mouse;
 use crate::overlay;
+use crate::renderer;
 use crate::scrollable;
 use crate::text;
 use crate::touch;
@@ -236,7 +237,7 @@ where
     fn draw(
         &self,
         renderer: &mut Renderer,
-        defaults: &Renderer::Defaults,
+        style: &renderer::Style,
         layout: Layout<'_>,
         cursor_position: Point,
     ) {
@@ -380,7 +381,7 @@ where
     fn draw(
         &self,
         _renderer: &mut Renderer,
-        _defaults: &Renderer::Defaults,
+        _style: &renderer::Style,
         _layout: Layout<'_>,
         _cursor_position: Point,
         _viewport: &Rectangle,
-- 
cgit 


From d61cb58d92b6fcd520f665deb093f3747ffd5e5c Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 18 Oct 2021 15:36:32 +0700
Subject: Wire up `container` styling to `iced_native`

---
 native/src/overlay/menu.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index f2367ae7..a6527a8d 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -1,5 +1,4 @@
 //! Build and show dropdown menus.
-use crate::container;
 use crate::event::{self, Event};
 use crate::layout;
 use crate::mouse;
@@ -396,7 +395,7 @@ where
 /// able to use a [`Menu`] in your user interface.
 ///
 /// [renderer]: crate::renderer
-pub trait Renderer: container::Renderer + text::Renderer {
+pub trait Renderer: text::Renderer {
     /// The [`Menu`] style supported by this renderer.
     type Style: Default + Clone;
 }
-- 
cgit 


From be97a5d502df8c8b23704f5a8a0d425f4eff2215 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 18 Oct 2021 16:43:18 +0700
Subject: Introduce `mouse_interaction` method to `Widget` trait

---
 native/src/overlay/element.rs | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index bf3fb3f0..988cca09 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -2,8 +2,9 @@ pub use crate::Overlay;
 
 use crate::event::{self, Event};
 use crate::layout;
+use crate::mouse;
 use crate::renderer;
-use crate::{Clipboard, Hasher, Layout, Point, Size, Vector};
+use crate::{Clipboard, Hasher, Layout, Point, Rectangle, Size, Vector};
 
 /// A generic [`Overlay`].
 #[allow(missing_debug_implementations)]
@@ -68,6 +69,16 @@ where
         )
     }
 
+    pub fn mouse_interaction(
+        &self,
+        layout: Layout<'_>,
+        viewport: &Rectangle,
+        cursor_position: Point,
+    ) -> mouse::Interaction {
+        self.overlay
+            .mouse_interaction(layout, viewport, cursor_position)
+    }
+
     /// Draws the [`Element`] and its children using the given [`Layout`].
     pub fn draw(
         &self,
-- 
cgit 


From e914888f57394e4b67b40e42f1ad9df4ae8147e6 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 20 Oct 2021 18:40:39 +0700
Subject: Implement `Widget::draw` for `TextInput`

---
 native/src/overlay/menu.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index a6527a8d..0c335bb6 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -395,7 +395,7 @@ where
 /// able to use a [`Menu`] in your user interface.
 ///
 /// [renderer]: crate::renderer
-pub trait Renderer: text::Renderer {
+pub trait Renderer: renderer::Text {
     /// The [`Menu`] style supported by this renderer.
     type Style: Default + Clone;
 }
-- 
cgit 


From fe4dfeafdbc8f427bd351f394d27f606a3843b44 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 28 Oct 2021 15:41:12 +0700
Subject: Wire up style to `PickList` and `overlay::Menu`

---
 native/src/overlay/menu.rs | 43 +++++++++++++++----------------------------
 1 file changed, 15 insertions(+), 28 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 0c335bb6..ebb2a4e1 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -5,16 +5,17 @@ use crate::mouse;
 use crate::overlay;
 use crate::renderer;
 use crate::scrollable;
-use crate::text;
 use crate::touch;
 use crate::{
     Clipboard, Container, Element, Hasher, Layout, Length, Padding, Point,
     Rectangle, Scrollable, Size, Vector, Widget,
 };
 
+pub use iced_style::menu::Style;
+
 /// A list of selectable options.
 #[allow(missing_debug_implementations)]
-pub struct Menu<'a, T, Renderer: self::Renderer> {
+pub struct Menu<'a, T, Renderer: renderer::Text> {
     state: &'a mut State,
     options: &'a [T],
     hovered_option: &'a mut Option<usize>,
@@ -23,13 +24,13 @@ pub struct Menu<'a, T, Renderer: self::Renderer> {
     padding: Padding,
     text_size: Option<u16>,
     font: Renderer::Font,
-    style: <Renderer as self::Renderer>::Style,
+    style: Style,
 }
 
 impl<'a, T, Renderer> Menu<'a, T, Renderer>
 where
     T: ToString + Clone,
-    Renderer: self::Renderer + 'a,
+    Renderer: renderer::Text + 'a,
 {
     /// Creates a new [`Menu`] with the given [`State`], a list of options, and
     /// the message to produced when an option is selected.
@@ -77,10 +78,7 @@ where
     }
 
     /// Sets the style of the [`Menu`].
-    pub fn style(
-        mut self,
-        style: impl Into<<Renderer as self::Renderer>::Style>,
-    ) -> Self {
+    pub fn style(mut self, style: impl Into<Style>) -> Self {
         self.style = style.into();
         self
     }
@@ -116,14 +114,14 @@ impl State {
     }
 }
 
-struct Overlay<'a, Message, Renderer: self::Renderer> {
+struct Overlay<'a, Message, Renderer: renderer::Text> {
     container: Container<'a, Message, Renderer>,
     width: u16,
     target_height: f32,
-    style: <Renderer as self::Renderer>::Style,
+    style: Style,
 }
 
-impl<'a, Message, Renderer: self::Renderer> Overlay<'a, Message, Renderer>
+impl<'a, Message, Renderer: renderer::Text> Overlay<'a, Message, Renderer>
 where
     Message: 'a,
     Renderer: 'a,
@@ -168,7 +166,7 @@ where
 impl<'a, Message, Renderer> crate::Overlay<Message, Renderer>
     for Overlay<'a, Message, Renderer>
 where
-    Renderer: self::Renderer,
+    Renderer: renderer::Text,
 {
     fn layout(
         &self,
@@ -258,21 +256,21 @@ where
     }
 }
 
-struct List<'a, T, Renderer: self::Renderer> {
+struct List<'a, T, Renderer: renderer::Text> {
     options: &'a [T],
     hovered_option: &'a mut Option<usize>,
     last_selection: &'a mut Option<T>,
     padding: Padding,
     text_size: Option<u16>,
     font: Renderer::Font,
-    style: <Renderer as self::Renderer>::Style,
+    style: Style,
 }
 
-impl<'a, T, Message, Renderer: self::Renderer> Widget<Message, Renderer>
+impl<'a, T, Message, Renderer> Widget<Message, Renderer>
     for List<'a, T, Renderer>
 where
     T: Clone + ToString,
-    Renderer: self::Renderer,
+    Renderer: renderer::Text,
 {
     fn width(&self) -> Length {
         Length::Fill
@@ -389,23 +387,12 @@ where
     }
 }
 
-/// The renderer of a [`Menu`].
-///
-/// Your [renderer] will need to implement this trait before being
-/// able to use a [`Menu`] in your user interface.
-///
-/// [renderer]: crate::renderer
-pub trait Renderer: renderer::Text {
-    /// The [`Menu`] style supported by this renderer.
-    type Style: Default + Clone;
-}
-
 impl<'a, T, Message, Renderer> Into<Element<'a, Message, Renderer>>
     for List<'a, T, Renderer>
 where
     T: ToString + Clone,
     Message: 'a,
-    Renderer: 'a + self::Renderer,
+    Renderer: 'a + renderer::Text,
 {
     fn into(self) -> Element<'a, Message, Renderer> {
         Element::new(self)
-- 
cgit 


From 081f2c1e1a65a084326d5f7f9bbce68440369308 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 28 Oct 2021 16:43:05 +0700
Subject: Implement `Widget::draw` for `overlay::Menu`

---
 native/src/overlay/menu.rs | 92 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 71 insertions(+), 21 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index ebb2a4e1..8f91e4b7 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -1,14 +1,16 @@
 //! Build and show dropdown menus.
+use crate::alignment;
 use crate::event::{self, Event};
 use crate::layout;
 use crate::mouse;
 use crate::overlay;
 use crate::renderer;
+use crate::renderer::text;
 use crate::scrollable;
 use crate::touch;
 use crate::{
-    Clipboard, Container, Element, Hasher, Layout, Length, Padding, Point,
-    Rectangle, Scrollable, Size, Vector, Widget,
+    Clipboard, Color, Container, Element, Hasher, Layout, Length, Padding,
+    Point, Rectangle, Scrollable, Size, Vector, Widget,
 };
 
 pub use iced_style::menu::Style;
@@ -238,21 +240,18 @@ where
         layout: Layout<'_>,
         cursor_position: Point,
     ) {
-        // TODO
-        // let primitives = self.container.draw(
-        //     renderer,
-        //     defaults,
-        //     layout,
-        //     cursor_position,
-        //     &layout.bounds(),
-        // );
-
-        // renderer.decorate(
-        //     layout.bounds(),
-        //     cursor_position,
-        //     &self.style,
-        //     primitives,
-        // )
+        let bounds = layout.bounds();
+
+        renderer.fill_rectangle(renderer::Quad {
+            bounds,
+            background: self.style.background,
+            border_color: self.style.border_color,
+            border_width: self.style.border_width,
+            border_radius: 0.0,
+        });
+
+        self.container
+            .draw(renderer, style, layout, cursor_position, &bounds);
     }
 }
 
@@ -377,13 +376,64 @@ where
 
     fn draw(
         &self,
-        _renderer: &mut Renderer,
+        renderer: &mut Renderer,
         _style: &renderer::Style,
-        _layout: Layout<'_>,
+        layout: Layout<'_>,
         _cursor_position: Point,
-        _viewport: &Rectangle,
+        viewport: &Rectangle,
     ) {
-        // TODO
+        let bounds = layout.bounds();
+
+        let text_size = self.text_size.unwrap_or(renderer.default_size());
+        let option_height = (text_size + self.padding.vertical()) as usize;
+
+        let offset = viewport.y - bounds.y;
+        let start = (offset / option_height as f32) as usize;
+        let end =
+            ((offset + viewport.height) / option_height as f32).ceil() as usize;
+
+        let visible_options = &self.options[start..end.min(self.options.len())];
+
+        for (i, option) in visible_options.iter().enumerate() {
+            let i = start + i;
+            let is_selected = *self.hovered_option == Some(i);
+
+            let bounds = Rectangle {
+                x: bounds.x,
+                y: bounds.y + (option_height * i) as f32,
+                width: bounds.width,
+                height: f32::from(text_size + self.padding.vertical()),
+            };
+
+            if is_selected {
+                renderer.fill_rectangle(renderer::Quad {
+                    bounds,
+                    background: self.style.selected_background,
+                    border_color: Color::TRANSPARENT,
+                    border_width: 0.0,
+                    border_radius: 0.0,
+                });
+            }
+
+            renderer.fill_text(text::Section {
+                content: &option.to_string(),
+                bounds: Rectangle {
+                    x: bounds.x + self.padding.left as f32,
+                    y: bounds.center_y(),
+                    width: f32::INFINITY,
+                    ..bounds
+                },
+                size: f32::from(text_size),
+                font: self.font,
+                color: if is_selected {
+                    self.style.selected_text_color
+                } else {
+                    self.style.text_color
+                },
+                horizontal_alignment: alignment::Horizontal::Left,
+                vertical_alignment: alignment::Vertical::Center,
+            });
+        }
     }
 }
 
-- 
cgit 


From 1ec667920a792dbe96786a44b8b3064cae7eaea2 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 28 Oct 2021 16:47:52 +0700
Subject: Implement `Overlay::mouse_interaction` for `overlay::Menu`

---
 native/src/overlay/menu.rs | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 8f91e4b7..1ba953f3 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -233,6 +233,16 @@ where
         )
     }
 
+    fn mouse_interaction(
+        &self,
+        layout: Layout<'_>,
+        viewport: &Rectangle,
+        cursor_position: Point,
+    ) -> mouse::Interaction {
+        self.container
+            .mouse_interaction(layout, viewport, cursor_position)
+    }
+
     fn draw(
         &self,
         renderer: &mut Renderer,
@@ -374,6 +384,21 @@ where
         event::Status::Ignored
     }
 
+    fn mouse_interaction(
+        &self,
+        layout: Layout<'_>,
+        _viewport: &Rectangle,
+        cursor_position: Point,
+    ) -> mouse::Interaction {
+        let is_mouse_over = layout.bounds().contains(cursor_position);
+
+        if is_mouse_over {
+            mouse::Interaction::Pointer
+        } else {
+            mouse::Interaction::default()
+        }
+    }
+
     fn draw(
         &self,
         renderer: &mut Renderer,
-- 
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`

---
 native/src/overlay/menu.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 1ba953f3..646d5133 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -6,11 +6,12 @@ use crate::mouse;
 use crate::overlay;
 use crate::renderer;
 use crate::renderer::text;
-use crate::scrollable;
 use crate::touch;
+use crate::widget::scrollable::{self, Scrollable};
+use crate::widget::Container;
 use crate::{
-    Clipboard, Color, Container, Element, Hasher, Layout, Length, Padding,
-    Point, Rectangle, Scrollable, Size, Vector, Widget,
+    Clipboard, Color, Element, Hasher, Layout, Length, Padding, Point,
+    Rectangle, Size, Vector, Widget,
 };
 
 pub use iced_style::menu::Style;
-- 
cgit 


From b3a01973c6c726e6539be959659f4306ef3234c6 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 31 Oct 2021 16:13:03 +0700
Subject: Introduce first-class `text` module in `iced_native`

---
 native/src/overlay/menu.rs | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 646d5133..c4d1e171 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -5,7 +5,7 @@ use crate::layout;
 use crate::mouse;
 use crate::overlay;
 use crate::renderer;
-use crate::renderer::text;
+use crate::text::{self, Text};
 use crate::touch;
 use crate::widget::scrollable::{self, Scrollable};
 use crate::widget::Container;
@@ -18,7 +18,7 @@ pub use iced_style::menu::Style;
 
 /// A list of selectable options.
 #[allow(missing_debug_implementations)]
-pub struct Menu<'a, T, Renderer: renderer::Text> {
+pub struct Menu<'a, T, Renderer: text::Renderer> {
     state: &'a mut State,
     options: &'a [T],
     hovered_option: &'a mut Option<usize>,
@@ -33,7 +33,7 @@ pub struct Menu<'a, T, Renderer: renderer::Text> {
 impl<'a, T, Renderer> Menu<'a, T, Renderer>
 where
     T: ToString + Clone,
-    Renderer: renderer::Text + 'a,
+    Renderer: text::Renderer + 'a,
 {
     /// Creates a new [`Menu`] with the given [`State`], a list of options, and
     /// the message to produced when an option is selected.
@@ -117,14 +117,14 @@ impl State {
     }
 }
 
-struct Overlay<'a, Message, Renderer: renderer::Text> {
+struct Overlay<'a, Message, Renderer: text::Renderer> {
     container: Container<'a, Message, Renderer>,
     width: u16,
     target_height: f32,
     style: Style,
 }
 
-impl<'a, Message, Renderer: renderer::Text> Overlay<'a, Message, Renderer>
+impl<'a, Message, Renderer: text::Renderer> Overlay<'a, Message, Renderer>
 where
     Message: 'a,
     Renderer: 'a,
@@ -169,7 +169,7 @@ where
 impl<'a, Message, Renderer> crate::Overlay<Message, Renderer>
     for Overlay<'a, Message, Renderer>
 where
-    Renderer: renderer::Text,
+    Renderer: text::Renderer,
 {
     fn layout(
         &self,
@@ -266,7 +266,7 @@ where
     }
 }
 
-struct List<'a, T, Renderer: renderer::Text> {
+struct List<'a, T, Renderer: text::Renderer> {
     options: &'a [T],
     hovered_option: &'a mut Option<usize>,
     last_selection: &'a mut Option<T>,
@@ -280,7 +280,7 @@ impl<'a, T, Message, Renderer> Widget<Message, Renderer>
     for List<'a, T, Renderer>
 where
     T: Clone + ToString,
-    Renderer: renderer::Text,
+    Renderer: text::Renderer,
 {
     fn width(&self) -> Length {
         Length::Fill
@@ -441,7 +441,7 @@ where
                 });
             }
 
-            renderer.fill_text(text::Section {
+            renderer.fill_text(Text {
                 content: &option.to_string(),
                 bounds: Rectangle {
                     x: bounds.x + self.padding.left as f32,
@@ -468,7 +468,7 @@ impl<'a, T, Message, Renderer> Into<Element<'a, Message, Renderer>>
 where
     T: ToString + Clone,
     Message: 'a,
-    Renderer: 'a + renderer::Text,
+    Renderer: 'a + text::Renderer,
 {
     fn into(self) -> Element<'a, Message, Renderer> {
         Element::new(self)
-- 
cgit 


From 631e95ee0be01dc7f5e5183e1429972aee37787f Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 2 Nov 2021 15:03:29 +0700
Subject: Move `viewport` argument to last position in `mouse_interaction`
 methods

This keeps the order of the arguments consistent with `draw`.
---
 native/src/overlay/element.rs | 14 ++++++++++++--
 native/src/overlay/menu.rs    |  6 +++---
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index 988cca09..ef676fb4 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -72,11 +72,11 @@ where
     pub fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        viewport: &Rectangle,
         cursor_position: Point,
+        viewport: &Rectangle,
     ) -> mouse::Interaction {
         self.overlay
-            .mouse_interaction(layout, viewport, cursor_position)
+            .mouse_interaction(layout, cursor_position, viewport)
     }
 
     /// Draws the [`Element`] and its children using the given [`Layout`].
@@ -150,6 +150,16 @@ where
         event_status
     }
 
+    fn mouse_interaction(
+        &self,
+        layout: Layout<'_>,
+        cursor_position: Point,
+        viewport: &Rectangle,
+    ) -> mouse::Interaction {
+        self.content
+            .mouse_interaction(layout, cursor_position, viewport)
+    }
+
     fn draw(
         &self,
         renderer: &mut Renderer,
diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index c4d1e171..12dd4b0b 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -237,11 +237,11 @@ where
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        viewport: &Rectangle,
         cursor_position: Point,
+        viewport: &Rectangle,
     ) -> mouse::Interaction {
         self.container
-            .mouse_interaction(layout, viewport, cursor_position)
+            .mouse_interaction(layout, cursor_position, viewport)
     }
 
     fn draw(
@@ -388,8 +388,8 @@ where
     fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-        _viewport: &Rectangle,
         cursor_position: Point,
+        _viewport: &Rectangle,
     ) -> mouse::Interaction {
         let is_mouse_over = layout.bounds().contains(cursor_position);
 
-- 
cgit 


From 023aded2772f0cd6abd716fe5c8624d5d22e21fa Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 4 Nov 2021 19:22:29 +0700
Subject: Rename `fill_rectangle` to `fill_quad` in `Renderer`

---
 native/src/overlay/menu.rs | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/menu.rs b/native/src/overlay/menu.rs
index 12dd4b0b..ee3bee6e 100644
--- a/native/src/overlay/menu.rs
+++ b/native/src/overlay/menu.rs
@@ -253,13 +253,15 @@ where
     ) {
         let bounds = layout.bounds();
 
-        renderer.fill_rectangle(renderer::Quad {
-            bounds,
-            background: self.style.background,
-            border_color: self.style.border_color,
-            border_width: self.style.border_width,
-            border_radius: 0.0,
-        });
+        renderer.fill_quad(
+            renderer::Quad {
+                bounds,
+                border_color: self.style.border_color,
+                border_width: self.style.border_width,
+                border_radius: 0.0,
+            },
+            self.style.background,
+        );
 
         self.container
             .draw(renderer, style, layout, cursor_position, &bounds);
@@ -432,13 +434,15 @@ where
             };
 
             if is_selected {
-                renderer.fill_rectangle(renderer::Quad {
-                    bounds,
-                    background: self.style.selected_background,
-                    border_color: Color::TRANSPARENT,
-                    border_width: 0.0,
-                    border_radius: 0.0,
-                });
+                renderer.fill_quad(
+                    renderer::Quad {
+                        bounds,
+                        border_color: Color::TRANSPARENT,
+                        border_width: 0.0,
+                        border_radius: 0.0,
+                    },
+                    self.style.selected_background,
+                );
             }
 
             renderer.fill_text(Text {
-- 
cgit 


From aca9d414d311f901cfe6494a28a48a563f17320b Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 5 Nov 2021 15:31:33 +0700
Subject: Write missing documentation in `iced_native`

---
 native/src/overlay/element.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'native/src/overlay')

diff --git a/native/src/overlay/element.rs b/native/src/overlay/element.rs
index ef676fb4..f418a518 100644
--- a/native/src/overlay/element.rs
+++ b/native/src/overlay/element.rs
@@ -69,6 +69,7 @@ where
         )
     }
 
+    /// Returns the current [`mouse::Interaction`] of the [`Element`].
     pub fn mouse_interaction(
         &self,
         layout: Layout<'_>,
-- 
cgit