From 05af8d00d4c0f7b8e0ece85224fd90a92da86da8 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 19 May 2020 17:15:44 +0200
Subject: Draft new `iced_graphics` crate :tada:

---
 graphics/src/widget/progress_bar.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 graphics/src/widget/progress_bar.rs

(limited to 'graphics/src/widget/progress_bar.rs')

diff --git a/graphics/src/widget/progress_bar.rs b/graphics/src/widget/progress_bar.rs
new file mode 100644
index 00000000..c1e5702e
--- /dev/null
+++ b/graphics/src/widget/progress_bar.rs
@@ -0,0 +1,15 @@
+//! Allow your users to visually track the progress of a computation.
+//!
+//! A [`ProgressBar`] has a range of possible values and a current value,
+//! as well as a length, height and style.
+//!
+//! [`ProgressBar`]: type.ProgressBar.html
+use crate::Renderer;
+
+pub use iced_style::progress_bar::{Style, StyleSheet};
+
+/// A bar that displays progress.
+///
+/// This is an alias of an `iced_native` progress bar with an
+/// `iced_wgpu::Renderer`.
+pub type ProgressBar<Backend> = iced_native::ProgressBar<Renderer<Backend>>;
-- 
cgit 


From e6180912488db4d59fbffcb46c5930282306cb92 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 19 May 2020 21:00:40 +0200
Subject: Merge unnecessary split widget modules

---
 graphics/src/widget/progress_bar.rs | 60 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

(limited to 'graphics/src/widget/progress_bar.rs')

diff --git a/graphics/src/widget/progress_bar.rs b/graphics/src/widget/progress_bar.rs
index c1e5702e..48acb3c1 100644
--- a/graphics/src/widget/progress_bar.rs
+++ b/graphics/src/widget/progress_bar.rs
@@ -4,7 +4,10 @@
 //! as well as a length, height and style.
 //!
 //! [`ProgressBar`]: type.ProgressBar.html
-use crate::Renderer;
+use crate::{Backend, Primitive, Renderer};
+use iced_native::mouse;
+use iced_native::progress_bar;
+use iced_native::{Color, Rectangle};
 
 pub use iced_style::progress_bar::{Style, StyleSheet};
 
@@ -13,3 +16,58 @@ pub use iced_style::progress_bar::{Style, StyleSheet};
 /// This is an alias of an `iced_native` progress bar with an
 /// `iced_wgpu::Renderer`.
 pub type ProgressBar<Backend> = iced_native::ProgressBar<Renderer<Backend>>;
+
+impl<B> progress_bar::Renderer for Renderer<B>
+where
+    B: Backend,
+{
+    type Style = Box<dyn StyleSheet>;
+
+    const DEFAULT_HEIGHT: u16 = 30;
+
+    fn draw(
+        &self,
+        bounds: Rectangle,
+        range: std::ops::RangeInclusive<f32>,
+        value: f32,
+        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));
+
+        let background = Primitive::Group {
+            primitives: vec![Primitive::Quad {
+                bounds: Rectangle { ..bounds },
+                background: style.background,
+                border_radius: style.border_radius,
+                border_width: 0,
+                border_color: Color::TRANSPARENT,
+            }],
+        };
+
+        (
+            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
+            },
+            mouse::Interaction::default(),
+        )
+    }
+}
-- 
cgit