From d0dc7cebf9c352f4d14827fe47489788f59e61a1 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 6 Jan 2020 21:01:09 +0100
Subject: Implement styling for `Scrollable`

---
 wgpu/src/renderer/widget/scrollable.rs | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'wgpu/src/renderer/widget')

diff --git a/wgpu/src/renderer/widget/scrollable.rs b/wgpu/src/renderer/widget/scrollable.rs
index 42a4a743..30d7f337 100644
--- a/wgpu/src/renderer/widget/scrollable.rs
+++ b/wgpu/src/renderer/widget/scrollable.rs
@@ -7,6 +7,8 @@ const SCROLLBAR_WIDTH: u16 = 10;
 const SCROLLBAR_MARGIN: u16 = 2;
 
 impl scrollable::Renderer for Renderer {
+    type Style = Box<dyn iced_style::scrollable::StyleSheet>;
+
     fn scrollbar(
         &self,
         bounds: Rectangle,
@@ -53,6 +55,7 @@ impl scrollable::Renderer for Renderer {
         is_mouse_over_scrollbar: bool,
         scrollbar: Option<scrollable::Scrollbar>,
         offset: u32,
+        style_sheet: &Self::Style,
         (content, mouse_cursor): Self::Output,
     ) -> Self::Output {
         let clip = Primitive::Clip {
@@ -64,17 +67,23 @@ impl scrollable::Renderer for Renderer {
         (
             if let Some(scrollbar) = scrollbar {
                 if is_mouse_over || state.is_scroller_grabbed() {
+                    let style = if state.is_scroller_grabbed() {
+                        style_sheet.dragging()
+                    } else if is_mouse_over_scrollbar {
+                        style_sheet.hovered()
+                    } else {
+                        style_sheet.active()
+                    };
+
                     let scroller = Primitive::Quad {
                         bounds: scrollbar.scroller.bounds,
-                        background: Background::Color(
-                            [0.0, 0.0, 0.0, 0.7].into(),
-                        ),
-                        border_radius: 5,
-                        border_width: 0,
-                        border_color: Color::TRANSPARENT,
+                        background: Background::Color(style.scroller.color),
+                        border_radius: style.scroller.border_radius,
+                        border_width: style.scroller.border_width,
+                        border_color: style.scroller.border_color,
                     };
 
-                    if is_mouse_over_scrollbar || state.is_scroller_grabbed() {
+                    if style.background.is_some() || style.border_width > 0 {
                         let scrollbar = Primitive::Quad {
                             bounds: Rectangle {
                                 x: scrollbar.bounds.x
@@ -83,12 +92,12 @@ impl scrollable::Renderer for Renderer {
                                     - f32::from(2 * SCROLLBAR_MARGIN),
                                 ..scrollbar.bounds
                             },
-                            background: Background::Color(
-                                [0.0, 0.0, 0.0, 0.3].into(),
+                            background: style.background.unwrap_or(
+                                Background::Color(Color::TRANSPARENT),
                             ),
-                            border_radius: 5,
-                            border_width: 0,
-                            border_color: Color::TRANSPARENT,
+                            border_radius: style.border_radius,
+                            border_width: style.border_width,
+                            border_color: style.border_color,
                         };
 
                         Primitive::Group {
-- 
cgit