From 64fc0ffded3d4243bbe288a760319ff100d060e1 Mon Sep 17 00:00:00 2001
From: debris <marek.kotewicz@gmail.com>
Date: Thu, 22 Aug 2019 15:57:18 +0200
Subject: migrated Image and ProgressBar widgets

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

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

diff --git a/src/widget/progress_bar.rs b/src/widget/progress_bar.rs
new file mode 100644
index 00000000..0ce274e4
--- /dev/null
+++ b/src/widget/progress_bar.rs
@@ -0,0 +1,117 @@
+//! Displays action progress to your users.
+
+use crate::{
+    Style, Node, Element, MouseCursor, Layout, Hasher, Widget,
+    Point, Rectangle,
+};
+
+use std::hash::Hash;
+
+/// A widget that displays a progress of an action.
+/// 
+/// It implements [`Widget`] when the associated [`core::Renderer`] implements
+/// the [`button::Renderer`] trait.
+///
+/// [`Widget`]: ../../core/trait.Widget.html
+/// [`core::Renderer`]: ../../core/trait.Renderer.html
+/// [`progress_bar::Renderer`]: trait.Renderer.html
+/// # Example
+///
+/// ```
+/// use coffee::ui::ProgressBar;
+///
+/// let progress = 0.75;
+///
+/// ProgressBar::new(progress);
+/// ```
+#[derive(Debug)]
+pub struct ProgressBar {
+    progress: f32,
+    style: Style,
+}
+
+impl ProgressBar {
+    /// Creates a new [`ProgressBar`] with given progress.
+    ///
+    /// [`ProgressBar`]: struct.ProgressBar.html
+    pub fn new(progress: f32) -> Self {
+        ProgressBar {
+            progress,
+            style: Style::default().fill_width(),
+        }
+    }
+
+    /// Sets the width of the [`ProgressBar`] in pixels.
+    ///
+    /// [`ProgressBar`]: struct.ProgressBar.html
+    pub fn width(mut self, width: u32) -> Self {
+        self.style = self.style.width(width);
+        self
+    }
+
+    /// Makes the [`ProgressBar`] fill the horizontal space of its container.
+    ///
+    /// [`ProgressBar`]: struct.ProgressBar.html
+    pub fn fill_width(mut self) -> Self {
+        self.style = self.style.fill_width();
+        self
+    }
+}
+
+impl<Message, Renderer> Widget<Message, Renderer> for ProgressBar
+where
+    Renderer: self::Renderer 
+{
+    fn node(&self, _renderer: &Renderer) -> Node {
+        Node::new(self.style.height(50))
+    }
+
+    fn draw(
+        &self,
+        renderer: &mut Renderer,
+        layout: Layout<'_>,
+        _cursor_position: Point,
+    ) -> MouseCursor {
+        renderer.draw(
+            layout.bounds(),
+            self.progress,
+        );
+
+        MouseCursor::OutOfBounds
+    }
+
+    fn hash(&self, state: &mut Hasher) {
+        self.style.hash(state);
+    }
+}
+
+/// The renderer of a [`ProgressBar`].
+///
+/// Your [`core::Renderer`] will need to implement this trait before being
+/// able to use a [`ProgressBar`] in your user interface.
+///
+/// [`ProgressBar`]: struct.ProgressBar.html
+/// [`core::Renderer`]: ../../core/trait.Renderer.html
+pub trait Renderer {
+    /// Draws a [`ProgressBar`].
+    ///
+    /// It receives:
+    ///   * the bounds of the [`ProgressBar`]
+    ///   * the progress of the [`ProgressBar`]
+    ///   
+    /// [`ProgressBar`]: struct.ProgressBar.html
+    fn draw(
+        &mut self,
+        bounds: Rectangle<f32>,
+        progress: f32,
+    );
+}
+
+impl<'a, Message, Renderer> From<ProgressBar> for Element<'a, Message, Renderer>
+where
+    Renderer: self::Renderer,
+{
+    fn from(progress_bar: ProgressBar) -> Element<'a, Message, Renderer> {
+        Element::new(progress_bar)
+    }
+}
-- 
cgit 


From 52394732fc2a5c6152a938f1b2967c921bfef7be Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 3 Sep 2019 13:47:32 +0200
Subject: Fix `Image` and `ProgressBar` doc examples

---
 src/widget/progress_bar.rs | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

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

diff --git a/src/widget/progress_bar.rs b/src/widget/progress_bar.rs
index 0ce274e4..19e164f6 100644
--- a/src/widget/progress_bar.rs
+++ b/src/widget/progress_bar.rs
@@ -1,14 +1,13 @@
 //! Displays action progress to your users.
 
 use crate::{
-    Style, Node, Element, MouseCursor, Layout, Hasher, Widget,
-    Point, Rectangle,
+    Element, Hasher, Layout, MouseCursor, Node, Point, Rectangle, Style, Widget,
 };
 
 use std::hash::Hash;
 
 /// A widget that displays a progress of an action.
-/// 
+///
 /// It implements [`Widget`] when the associated [`core::Renderer`] implements
 /// the [`button::Renderer`] trait.
 ///
@@ -18,7 +17,7 @@ use std::hash::Hash;
 /// # Example
 ///
 /// ```
-/// use coffee::ui::ProgressBar;
+/// use iced::ProgressBar;
 ///
 /// let progress = 0.75;
 ///
@@ -60,7 +59,7 @@ impl ProgressBar {
 
 impl<Message, Renderer> Widget<Message, Renderer> for ProgressBar
 where
-    Renderer: self::Renderer 
+    Renderer: self::Renderer,
 {
     fn node(&self, _renderer: &Renderer) -> Node {
         Node::new(self.style.height(50))
@@ -72,10 +71,7 @@ where
         layout: Layout<'_>,
         _cursor_position: Point,
     ) -> MouseCursor {
-        renderer.draw(
-            layout.bounds(),
-            self.progress,
-        );
+        renderer.draw(layout.bounds(), self.progress);
 
         MouseCursor::OutOfBounds
     }
@@ -98,13 +94,9 @@ pub trait Renderer {
     /// It receives:
     ///   * the bounds of the [`ProgressBar`]
     ///   * the progress of the [`ProgressBar`]
-    ///   
+    ///
     /// [`ProgressBar`]: struct.ProgressBar.html
-    fn draw(
-        &mut self,
-        bounds: Rectangle<f32>,
-        progress: f32,
-    );
+    fn draw(&mut self, bounds: Rectangle<f32>, progress: f32);
 }
 
 impl<'a, Message, Renderer> From<ProgressBar> for Element<'a, Message, Renderer>
-- 
cgit