From 986f01237f227ad2eaabda982324fc26840cb12b Mon Sep 17 00:00:00 2001
From: Songtronix <contact@songtronix.com>
Date: Thu, 2 Jan 2020 18:07:00 +0100
Subject: change(widget): make height adjustable at widget level

addtionally rename Progressbar to ProgressBar
---
 wgpu/src/renderer/widget/progress_bar.rs | 45 ++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 wgpu/src/renderer/widget/progress_bar.rs

(limited to 'wgpu/src/renderer/widget/progress_bar.rs')

diff --git a/wgpu/src/renderer/widget/progress_bar.rs b/wgpu/src/renderer/widget/progress_bar.rs
new file mode 100644
index 00000000..3550df23
--- /dev/null
+++ b/wgpu/src/renderer/widget/progress_bar.rs
@@ -0,0 +1,45 @@
+use crate::{Primitive, Renderer};
+use iced_native::{progress_bar, Background, Color, MouseCursor, Rectangle};
+
+impl progress_bar::Renderer for Renderer {
+    fn draw(
+        &self,
+        bounds: Rectangle,
+        range: std::ops::RangeInclusive<f32>,
+        value: f32,
+        background: Option<Background>,
+        active_color: Option<Color>,
+    ) -> Self::Output {
+        let (range_start, range_end) = range.into_inner();
+        let active_progress_width = bounds.width
+            * ((value - range_start) / (range_end - range_start).max(1.0));
+
+        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,
+            }],
+        };
+
+        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],
+            },
+            MouseCursor::OutOfBounds,
+        )
+    }
+}
-- 
cgit 


From 9116afaf59f5ea697bed55ed3d11e2afd76ad4aa Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 3 Jan 2020 18:23:19 +0100
Subject: Move `DEFAULT_HEIGHT` constant to `Renderer`

Also fixes some minor documentation issues.
---
 wgpu/src/renderer/widget/progress_bar.rs | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'wgpu/src/renderer/widget/progress_bar.rs')

diff --git a/wgpu/src/renderer/widget/progress_bar.rs b/wgpu/src/renderer/widget/progress_bar.rs
index 3550df23..8ed4bab7 100644
--- a/wgpu/src/renderer/widget/progress_bar.rs
+++ b/wgpu/src/renderer/widget/progress_bar.rs
@@ -2,6 +2,8 @@ use crate::{Primitive, Renderer};
 use iced_native::{progress_bar, Background, Color, MouseCursor, Rectangle};
 
 impl progress_bar::Renderer for Renderer {
+    const DEFAULT_HEIGHT: u16 = 30;
+
     fn draw(
         &self,
         bounds: Rectangle,
-- 
cgit