From c0596179bd8582e4f4b5289cdeee8de4fa3de464 Mon Sep 17 00:00:00 2001
From: Robert Krahn <robert.krahn@gmail.com>
Date: Thu, 3 Nov 2022 00:35:01 +0100
Subject: non uniform border radius for quads

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

(limited to 'native/src/widget/scrollable.rs')

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 4ebb07a0..b445e505 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -698,7 +698,7 @@ pub fn draw<Renderer>(
                     renderer.fill_quad(
                         renderer::Quad {
                             bounds: scrollbar.bounds,
-                            border_radius: style.border_radius,
+                            border_radius: style.border_radius.into(),
                             border_width: style.border_width,
                             border_color: style.border_color,
                         },
@@ -715,7 +715,7 @@ pub fn draw<Renderer>(
                     renderer.fill_quad(
                         renderer::Quad {
                             bounds: scrollbar.scroller.bounds,
-                            border_radius: style.scroller.border_radius,
+                            border_radius: style.scroller.border_radius.into(),
                             border_width: style.scroller.border_width,
                             border_color: style.scroller.border_color,
                         },
-- 
cgit 


From 18fb74f20092b2703a90afdb01f39754445998da Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 9 Nov 2022 04:05:31 +0100
Subject: Introduce `Custom` variants for every style in  the built-in `Theme`

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

(limited to 'native/src/widget/scrollable.rs')

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 4ebb07a0..b257cbe5 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -233,7 +233,7 @@ where
             self.scrollbar_width,
             self.scrollbar_margin,
             self.scroller_width,
-            self.style,
+            &self.style,
             |renderer, layout, cursor_position, viewport| {
                 self.content.as_widget().draw(
                     &tree.children[0],
@@ -627,7 +627,7 @@ pub fn draw<Renderer>(
     scrollbar_width: u16,
     scrollbar_margin: u16,
     scroller_width: u16,
-    style: <Renderer::Theme as StyleSheet>::Style,
+    style: &<Renderer::Theme as StyleSheet>::Style,
     draw_content: impl FnOnce(&mut Renderer, Layout<'_>, Point, &Rectangle),
 ) where
     Renderer: crate::Renderer,
-- 
cgit 


From 44aba47b0e67ce3cf1d5e8a79768e8fe996f5580 Mon Sep 17 00:00:00 2001
From: mtkennerly <mtkennerly@gmail.com>
Date: Fri, 11 Nov 2022 08:44:10 +0800
Subject: Allow converting from widget-specific IDs to generic ID

---
 native/src/widget/scrollable.rs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'native/src/widget/scrollable.rs')

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index b257cbe5..32ec6eb3 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -334,6 +334,12 @@ impl Id {
     }
 }
 
+impl From<Id> for widget::Id {
+    fn from(id: Id) -> Self {
+        id.0
+    }
+}
+
 /// Produces a [`Command`] that snaps the [`Scrollable`] with the given [`Id`]
 /// to the provided `percentage`.
 pub fn snap_to<Message: 'static>(id: Id, percentage: f32) -> Command<Message> {
-- 
cgit 


From f1ada7a803998ac3fb2c1bedc6d6650264f3e603 Mon Sep 17 00:00:00 2001
From: tarkah <cforsstrom18@gmail.com>
Date: Sat, 19 Nov 2022 12:25:59 -0800
Subject: Allow &mut self in overlay

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

(limited to 'native/src/widget/scrollable.rs')

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index 32ec6eb3..495b7af1 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -276,13 +276,13 @@ where
     }
 
     fn overlay<'b>(
-        &'b self,
+        &'b mut self,
         tree: &'b mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
     ) -> Option<overlay::Element<'b, Message, Renderer>> {
         self.content
-            .as_widget()
+            .as_widget_mut()
             .overlay(
                 &mut tree.children[0],
                 layout.children().next().unwrap(),
-- 
cgit 


From a2864df098c57fe47bca4c028afcb94e08e804dc Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 5 Dec 2022 14:44:26 +0100
Subject: Fix scroller in `Scrollable` always being drawn

... instead of only drawing it when the mouse is over the `Scrollable`.
---
 native/src/widget/scrollable.rs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'native/src/widget/scrollable.rs')

diff --git a/native/src/widget/scrollable.rs b/native/src/widget/scrollable.rs
index a5e97aa7..a5e0e0e3 100644
--- a/native/src/widget/scrollable.rs
+++ b/native/src/widget/scrollable.rs
@@ -714,9 +714,8 @@ pub fn draw<Renderer>(
                     );
                 }
 
-                if is_mouse_over
-                    || state.is_scroller_grabbed()
-                    || is_scrollbar_visible
+                if (is_mouse_over || state.is_scroller_grabbed())
+                    && is_scrollbar_visible
                 {
                     renderer.fill_quad(
                         renderer::Quad {
-- 
cgit