Merge branch 'master' into paint-example

1 files changed, 28 insertions, 21 deletions

diff --git a/wgpu/src/renderer/widget/progress_bar.rs b/wgpu/src/renderer/widget/progress_bar.rs
index 8ed4bab7..34e33276 100644
--- a/wgpu/src/renderer/widget/progress_bar.rs
+++ b/wgpu/src/renderer/widget/progress_bar.rs
@@ -1,7 +1,9 @@
-use crate::{Primitive, Renderer};
-use iced_native::{progress_bar, Background, Color, MouseCursor, Rectangle};
+use crate::{progress_bar::StyleSheet, Primitive, Renderer};
+use iced_native::{progress_bar, Color, MouseCursor, Rectangle};
 
 impl progress_bar::Renderer for Renderer {
+    type Style = Box<dyn StyleSheet>;
+
     const DEFAULT_HEIGHT: u16 = 30;
 
     fn draw(
@@ -9,9 +11,10 @@ impl progress_bar::Renderer for Renderer {
         bounds: Rectangle,
         range: std::ops::RangeInclusive<f32>,
         value: f32,
-        background: Option<Background>,
-        active_color: Option<Color>,
+        style_sheet: &Self::Style,
     ) -> Self::Output {
+        let style = style_sheet.style();
+
         let (range_start, range_end) = range.into_inner();
         let active_progress_width = bounds.width
             * ((value - range_start) / (range_end - range_start).max(1.0));
@@ -19,27 +22,31 @@ impl progress_bar::Renderer for Renderer {
         let background = Primitive::Group {
             primitives: vec![Primitive::Quad {
                 bounds: Rectangle { ..bounds },
-                background: background
-                    .unwrap_or(Background::Color([0.6, 0.6, 0.6].into()))
-                    .into(),
-                border_radius: 5,
+                background: style.background,
+                border_radius: style.border_radius,
+                border_width: 0,
+                border_color: Color::TRANSPARENT,
             }],
         };
 
-        let active_progress = Primitive::Quad {
-            bounds: Rectangle {
-                width: active_progress_width,
-                ..bounds
-            },
-            background: Background::Color(
-                active_color.unwrap_or([0.0, 0.95, 0.0].into()),
-            ),
-            border_radius: 5,
-        };
-
         (
-            Primitive::Group {
-                primitives: vec![background, active_progress],
+            if active_progress_width > 0.0 {
+                let bar = Primitive::Quad {
+                    bounds: Rectangle {
+                        width: active_progress_width,
+                        ..bounds
+                    },
+                    background: style.bar,
+                    border_radius: style.border_radius,
+                    border_width: 0,
+                    border_color: Color::TRANSPARENT,
+                };
+
+                Primitive::Group {
+                    primitives: vec![background, bar],
+                }
+            } else {
+                background
             },
             MouseCursor::OutOfBounds,
         )