From d60f3b89a75f5b2ad8e6fb17827f5574a0a44bd1 Mon Sep 17 00:00:00 2001 From: Songtronix Date: Wed, 1 Jan 2020 17:27:14 +0100 Subject: [PATCH 1/7] add(widget): primitive progressbar widget --- core/src/background.rs | 2 +- examples/progressbar.rs | 51 +++++++++ native/src/widget.rs | 3 + native/src/widget/progressbar.rs | 135 ++++++++++++++++++++++++ native/src/widget/text_input.rs | 3 +- wgpu/src/renderer/widget.rs | 1 + wgpu/src/renderer/widget/progressbar.rs | 43 ++++++++ winit/src/conversion.rs | 3 +- winit/src/debug/basic.rs | 3 +- 9 files changed, 239 insertions(+), 5 deletions(-) create mode 100644 examples/progressbar.rs create mode 100644 native/src/widget/progressbar.rs create mode 100644 wgpu/src/renderer/widget/progressbar.rs diff --git a/core/src/background.rs b/core/src/background.rs index 2f75e45c5a..e1a37ddce1 100644 --- a/core/src/background.rs +++ b/core/src/background.rs @@ -12,4 +12,4 @@ impl From for Background { fn from(color: Color) -> Self { Background::Color(color) } -} \ No newline at end of file +} diff --git a/examples/progressbar.rs b/examples/progressbar.rs new file mode 100644 index 0000000000..4663f8dff3 --- /dev/null +++ b/examples/progressbar.rs @@ -0,0 +1,51 @@ +use iced::{slider, Column, Element, Sandbox, Settings, Slider}; +use iced_winit::Progressbar; + +pub fn main() { + Progress::run(Settings::default()) +} + +#[derive(Default)] +struct Progress { + value: f32, + progressbar_slider: slider::State, +} + +#[derive(Debug, Clone, Copy)] +enum Message { + SliderChanged(f32), +} + +impl Sandbox for Progress { + type Message = Message; + + fn new() -> Self { + Self::default() + } + + fn title(&self) -> String { + String::from("A simple Progressbar") + } + + fn update(&mut self, message: Message) { + match message { + Message::SliderChanged(x) => { + self.value = x; + } + } + } + + fn view(&mut self) -> Element { + Column::new() + .padding(20) + .push(Progressbar::new(0.0..=100.0, self.value)) + .padding(20) + .push(Slider::new( + &mut self.progressbar_slider, + 0.0..=100.0, + self.value, + Message::SliderChanged, + )) + .into() + } +} diff --git a/native/src/widget.rs b/native/src/widget.rs index dcc99645ae..d899da5856 100644 --- a/native/src/widget.rs +++ b/native/src/widget.rs @@ -25,6 +25,7 @@ pub mod checkbox; pub mod column; pub mod container; pub mod image; +pub mod progressbar; pub mod radio; pub mod row; pub mod scrollable; @@ -45,6 +46,8 @@ pub use container::Container; #[doc(no_inline)] pub use image::Image; #[doc(no_inline)] +pub use progressbar::Progressbar; +#[doc(no_inline)] pub use radio::Radio; #[doc(no_inline)] pub use row::Row; diff --git a/native/src/widget/progressbar.rs b/native/src/widget/progressbar.rs new file mode 100644 index 0000000000..a6725f2ce8 --- /dev/null +++ b/native/src/widget/progressbar.rs @@ -0,0 +1,135 @@ +//! Display a progressbar +//! +//! +//! [`Progressbar`]: struct.Progressbar.html +use crate::{ + layout, Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget, +}; + +use std::{hash::Hash, ops::RangeInclusive}; + +/// A progressbar +/// +/// # Example +/// +/// ``` +/// # use iced_native::Progressbar; +/// +/// Progressbar::new(0.0..=100.0, value); +/// ``` +/// +/// TODO: Get a progressbar render +/// ![Slider drawn by Coffee's renderer](https://github.com/hecrj/coffee/blob/bda9818f823dfcb8a7ad0ff4940b4d4b387b5208/images/ui/slider.png?raw=true) +#[allow(missing_debug_implementations)] +pub struct Progressbar { + range: RangeInclusive, + value: f32, + width: Length, +} + +impl Progressbar { + /// Creates a new [`Progressbar`]. + /// + /// It expects: + /// * an inclusive range of possible values + /// * the current value of the [`Progressbar`] + /// + /// [`Progressbar`]: struct.Progressbar.html + pub fn new(range: RangeInclusive, value: f32) -> Self { + Progressbar { + value: value.max(*range.start()).min(*range.end()), + range, + width: Length::Fill, + } + } + + /// Sets the width of the [`Progressbar`]. + /// + /// [`Progressbar`]: struct.Progressbar.html + pub fn width(mut self, width: Length) -> Self { + self.width = width; + self + } +} + +impl Widget for Progressbar +where + Renderer: self::Renderer, +{ + fn width(&self) -> Length { + self.width + } + + fn height(&self) -> Length { + Length::Shrink + } + + fn layout( + &self, + renderer: &Renderer, + limits: &layout::Limits, + ) -> layout::Node { + let limits = limits + .width(self.width) + .height(Length::Units(renderer.height() as u16)); + + let size = limits.resolve(Size::ZERO); + + layout::Node::new(size) + } + + fn draw( + &self, + renderer: &mut Renderer, + layout: Layout<'_>, + _cursor_position: Point, + ) -> Renderer::Output { + renderer.draw(layout.bounds(), self.range.clone(), self.value) + } + + fn hash_layout(&self, state: &mut Hasher) { + self.width.hash(state); + } +} + +/// The renderer of a [`Progressbar`]. +/// +/// Your [renderer] will need to implement this trait before being +/// able to use a [`Progressbar`] in your user interface. +/// +/// [`Progressbar`]: struct.Progressbar.html +/// [renderer]: ../../renderer/index.html +pub trait Renderer: crate::Renderer { + /// Returns the height of the [`Progressbar`]. + /// + /// [`Progressbar`]: struct.Progressbar.html + fn height(&self) -> u32; + + /// Draws a [`Progressbar`]. + /// + /// It receives: + /// * the local state of the [`Progressbar`] + /// * the bounds of the [`Progressbar`] + /// * the range of values of the [`Progressbar`] + /// * the current value of the [`Progressbar`] + /// + /// [`Progressbar`]: struct.Progressbar.html + /// [`State`]: struct.State.html + /// [`Class`]: enum.Class.html + fn draw( + &self, + bounds: Rectangle, + range: RangeInclusive, + value: f32, + ) -> Self::Output; +} + +impl<'a, Message, Renderer> From for Element<'a, Message, Renderer> +where + Renderer: self::Renderer, + Message: 'static, +{ + fn from(progressbar: Progressbar) -> Element<'a, Message, Renderer> { + Element::new(progressbar) + } +} diff --git a/native/src/widget/text_input.rs b/native/src/widget/text_input.rs index 1d1c32a2bf..c994b7ba9b 100644 --- a/native/src/widget/text_input.rs +++ b/native/src/widget/text_input.rs @@ -633,7 +633,8 @@ impl Value { .unwrap_or(self.len()) } - /// Returns a new [`Value`] containing the graphemes until the given `index`. + /// Returns a new [`Value`] containing the graphemes until the given + /// `index`. /// /// [`Value`]: struct.Value.html pub fn until(&self, index: usize) -> Self { diff --git a/wgpu/src/renderer/widget.rs b/wgpu/src/renderer/widget.rs index f82631d576..94ebd10ec8 100644 --- a/wgpu/src/renderer/widget.rs +++ b/wgpu/src/renderer/widget.rs @@ -2,6 +2,7 @@ mod button; mod checkbox; mod column; mod image; +mod progressbar; mod radio; mod row; mod scrollable; diff --git a/wgpu/src/renderer/widget/progressbar.rs b/wgpu/src/renderer/widget/progressbar.rs new file mode 100644 index 0000000000..3c62e54d22 --- /dev/null +++ b/wgpu/src/renderer/widget/progressbar.rs @@ -0,0 +1,43 @@ +use crate::{Primitive, Renderer}; +use iced_native::{progressbar, Background, Color, MouseCursor, Rectangle}; + +impl progressbar::Renderer for Renderer { + fn height(&self) -> u32 { + 30 + } + + fn draw( + &self, + bounds: Rectangle, + range: std::ops::RangeInclusive, + value: f32, + ) -> 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: Color::from_rgb(0.6, 0.6, 0.6).into(), + border_radius: 5, + }], + }; + + let active_progress = Primitive::Quad { + bounds: Rectangle { + width: active_progress_width, + ..bounds + }, + background: Background::Color([0.0, 0.95, 0.0].into()), + border_radius: 4, + }; + + ( + Primitive::Group { + primitives: vec![background, active_progress], + }, + MouseCursor::OutOfBounds, + ) + } +} diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs index 0537d853b9..279b975a88 100644 --- a/winit/src/conversion.rs +++ b/winit/src/conversion.rs @@ -50,7 +50,8 @@ pub fn button_state(element_state: winit::event::ElementState) -> ButtonState { } } -/// Convert some `ModifiersState` from [`winit`] to an [`iced_native`] modifiers state. +/// Convert some `ModifiersState` from [`winit`] to an [`iced_native`] modifiers +/// state. /// /// [`winit`]: https://github.com/rust-windowing/winit /// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native diff --git a/winit/src/debug/basic.rs b/winit/src/debug/basic.rs index c9da392cc5..d46edba66c 100644 --- a/winit/src/debug/basic.rs +++ b/winit/src/debug/basic.rs @@ -1,5 +1,4 @@ -use std::collections::VecDeque; -use std::time; +use std::{collections::VecDeque, time}; #[derive(Debug)] pub struct Debug { From bf8f83decc039494d310f6ecbb05cbab2c241cbf Mon Sep 17 00:00:00 2001 From: Songtronix Date: Thu, 2 Jan 2020 14:10:18 +0100 Subject: [PATCH 2/7] change(widget): custom coloring for progressbar --- examples/progressbar.rs | 26 +++++++++++----- native/src/widget/progressbar.rs | 41 ++++++++++++++++++++++--- wgpu/src/renderer/widget/progressbar.rs | 12 ++++++-- 3 files changed, 64 insertions(+), 15 deletions(-) diff --git a/examples/progressbar.rs b/examples/progressbar.rs index 4663f8dff3..c4ebf2486f 100644 --- a/examples/progressbar.rs +++ b/examples/progressbar.rs @@ -1,8 +1,17 @@ -use iced::{slider, Column, Element, Sandbox, Settings, Slider}; +use iced::{ + settings::Window, slider, Background, Color, Column, Element, Sandbox, + Settings, Slider, +}; use iced_winit::Progressbar; pub fn main() { - Progress::run(Settings::default()) + Progress::run(Settings { + window: Window { + size: (700, 300), + resizable: true, + decorations: true, + }, + }) } #[derive(Default)] @@ -29,17 +38,20 @@ impl Sandbox for Progress { fn update(&mut self, message: Message) { match message { - Message::SliderChanged(x) => { - self.value = x; - } + Message::SliderChanged(x) => self.value = x, } } fn view(&mut self) -> Element { Column::new() .padding(20) - .push(Progressbar::new(0.0..=100.0, self.value)) - .padding(20) + .push( + Progressbar::new(0.0..=100.0, self.value) + .background(Background::Color(Color::from_rgb( + 0.6, 0.6, 0.6, + ))) + .active_color(Color::from_rgb(0.0, 0.95, 0.0)), + ) .push(Slider::new( &mut self.progressbar_slider, 0.0..=100.0, diff --git a/native/src/widget/progressbar.rs b/native/src/widget/progressbar.rs index a6725f2ce8..fc55a80394 100644 --- a/native/src/widget/progressbar.rs +++ b/native/src/widget/progressbar.rs @@ -3,7 +3,8 @@ //! //! [`Progressbar`]: struct.Progressbar.html use crate::{ - layout, Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget, + layout, Background, Color, Element, Hasher, Layout, Length, Point, + Rectangle, Size, Widget, }; use std::{hash::Hash, ops::RangeInclusive}; @@ -14,17 +15,19 @@ use std::{hash::Hash, ops::RangeInclusive}; /// /// ``` /// # use iced_native::Progressbar; -/// +/// +/// let value = 50.0; /// Progressbar::new(0.0..=100.0, value); /// ``` /// -/// TODO: Get a progressbar render -/// ![Slider drawn by Coffee's renderer](https://github.com/hecrj/coffee/blob/bda9818f823dfcb8a7ad0ff4940b4d4b387b5208/images/ui/slider.png?raw=true) +/// ![Default Progressbar](https://user-images.githubusercontent.com/18618951/71662391-a316c200-2d51-11ea-9cef-52758cab85e3.png) #[allow(missing_debug_implementations)] pub struct Progressbar { range: RangeInclusive, value: f32, width: Length, + background: Option, + active_color: Option, } impl Progressbar { @@ -40,6 +43,8 @@ impl Progressbar { value: value.max(*range.start()).min(*range.end()), range, width: Length::Fill, + background: None, + active_color: None, } } @@ -50,6 +55,22 @@ impl Progressbar { self.width = width; self } + + /// Sets the background of the [`Progressbar`]. + /// + /// [`Progressbar`]: struct.Progressbar.html + pub fn background(mut self, background: Background) -> Self { + self.background = Some(background); + self + } + + /// Sets the active color of the [`Progressbar`]. + /// + /// [`Progressbar`]: struct.Progressbar.html + pub fn active_color(mut self, active_color: Color) -> Self { + self.active_color = Some(active_color); + self + } } impl Widget for Progressbar @@ -84,7 +105,13 @@ where layout: Layout<'_>, _cursor_position: Point, ) -> Renderer::Output { - renderer.draw(layout.bounds(), self.range.clone(), self.value) + renderer.draw( + layout.bounds(), + self.range.clone(), + self.value, + self.background, + self.active_color, + ) } fn hash_layout(&self, state: &mut Hasher) { @@ -112,6 +139,8 @@ pub trait Renderer: crate::Renderer { /// * the bounds of the [`Progressbar`] /// * the range of values of the [`Progressbar`] /// * the current value of the [`Progressbar`] + /// * maybe a specific background of the [`Progressbar`] + /// * maybe a specific active color of the [`Progressbar`] /// /// [`Progressbar`]: struct.Progressbar.html /// [`State`]: struct.State.html @@ -121,6 +150,8 @@ pub trait Renderer: crate::Renderer { bounds: Rectangle, range: RangeInclusive, value: f32, + background: Option, + active_color: Option, ) -> Self::Output; } diff --git a/wgpu/src/renderer/widget/progressbar.rs b/wgpu/src/renderer/widget/progressbar.rs index 3c62e54d22..f621343de8 100644 --- a/wgpu/src/renderer/widget/progressbar.rs +++ b/wgpu/src/renderer/widget/progressbar.rs @@ -11,6 +11,8 @@ impl progressbar::Renderer for Renderer { bounds: Rectangle, range: std::ops::RangeInclusive, value: f32, + background: Option, + active_color: Option, ) -> Self::Output { let (range_start, range_end) = range.into_inner(); let active_progress_width = bounds.width @@ -19,7 +21,9 @@ impl progressbar::Renderer for Renderer { let background = Primitive::Group { primitives: vec![Primitive::Quad { bounds: Rectangle { ..bounds }, - background: Color::from_rgb(0.6, 0.6, 0.6).into(), + background: background + .unwrap_or(Background::Color([0.6, 0.6, 0.6].into())) + .into(), border_radius: 5, }], }; @@ -29,8 +33,10 @@ impl progressbar::Renderer for Renderer { width: active_progress_width, ..bounds }, - background: Background::Color([0.0, 0.95, 0.0].into()), - border_radius: 4, + background: Background::Color( + active_color.unwrap_or([0.0, 0.95, 0.0].into()), + ), + border_radius: 5, }; ( From 986f01237f227ad2eaabda982324fc26840cb12b Mon Sep 17 00:00:00 2001 From: Songtronix Date: Thu, 2 Jan 2020 18:07:00 +0100 Subject: [PATCH 3/7] change(widget): make height adjustable at widget level addtionally rename Progressbar to ProgressBar --- examples/{progressbar.rs => progress_bar.rs} | 15 +-- native/src/widget.rs | 4 +- .../{progressbar.rs => progress_bar.rs} | 91 ++++++++++--------- wgpu/src/renderer/widget.rs | 2 +- .../{progressbar.rs => progress_bar.rs} | 8 +- 5 files changed, 61 insertions(+), 59 deletions(-) rename examples/{progressbar.rs => progress_bar.rs} (82%) rename native/src/widget/{progressbar.rs => progress_bar.rs} (57%) rename wgpu/src/renderer/widget/{progressbar.rs => progress_bar.rs} (88%) diff --git a/examples/progressbar.rs b/examples/progress_bar.rs similarity index 82% rename from examples/progressbar.rs rename to examples/progress_bar.rs index c4ebf2486f..56f5490316 100644 --- a/examples/progressbar.rs +++ b/examples/progress_bar.rs @@ -1,8 +1,8 @@ use iced::{ - settings::Window, slider, Background, Color, Column, Element, Sandbox, - Settings, Slider, + settings::Window, slider, Background, Color, Column, Element, Length, + Sandbox, Settings, Slider, }; -use iced_winit::Progressbar; +use iced_winit::ProgressBar; pub fn main() { Progress::run(Settings { @@ -17,7 +17,7 @@ pub fn main() { #[derive(Default)] struct Progress { value: f32, - progressbar_slider: slider::State, + progress_bar_slider: slider::State, } #[derive(Debug, Clone, Copy)] @@ -46,14 +46,15 @@ impl Sandbox for Progress { Column::new() .padding(20) .push( - Progressbar::new(0.0..=100.0, self.value) + ProgressBar::new(0.0..=100.0, self.value) .background(Background::Color(Color::from_rgb( 0.6, 0.6, 0.6, ))) - .active_color(Color::from_rgb(0.0, 0.95, 0.0)), + .active_color(Color::from_rgb(0.0, 0.95, 0.0)) + .height(Length::Units(30)), ) .push(Slider::new( - &mut self.progressbar_slider, + &mut self.progress_bar_slider, 0.0..=100.0, self.value, Message::SliderChanged, diff --git a/native/src/widget.rs b/native/src/widget.rs index d899da5856..ccc9b47e68 100644 --- a/native/src/widget.rs +++ b/native/src/widget.rs @@ -25,7 +25,7 @@ pub mod checkbox; pub mod column; pub mod container; pub mod image; -pub mod progressbar; +pub mod progress_bar; pub mod radio; pub mod row; pub mod scrollable; @@ -46,7 +46,7 @@ pub use container::Container; #[doc(no_inline)] pub use image::Image; #[doc(no_inline)] -pub use progressbar::Progressbar; +pub use progress_bar::ProgressBar; #[doc(no_inline)] pub use radio::Radio; #[doc(no_inline)] diff --git a/native/src/widget/progressbar.rs b/native/src/widget/progress_bar.rs similarity index 57% rename from native/src/widget/progressbar.rs rename to native/src/widget/progress_bar.rs index fc55a80394..f9b8702682 100644 --- a/native/src/widget/progressbar.rs +++ b/native/src/widget/progress_bar.rs @@ -1,7 +1,7 @@ -//! Display a progressbar +//! Display a ProgressBar //! //! -//! [`Progressbar`]: struct.Progressbar.html +//! [`ProgressBar`]: struct.ProgressBar.html use crate::{ layout, Background, Color, Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget, @@ -9,71 +9,83 @@ use crate::{ use std::{hash::Hash, ops::RangeInclusive}; -/// A progressbar +const DEFAULT_HEIGHT: Length = Length::Units(30); + +/// A ProgressBar /// /// # Example /// /// ``` -/// # use iced_native::Progressbar; -/// +/// # use iced_native::ProgressBar; +/// /// let value = 50.0; -/// Progressbar::new(0.0..=100.0, value); +/// ProgressBar::new(0.0..=100.0, value); /// ``` /// -/// ![Default Progressbar](https://user-images.githubusercontent.com/18618951/71662391-a316c200-2d51-11ea-9cef-52758cab85e3.png) +/// ![Default ProgressBar](https://user-images.githubusercontent.com/18618951/71662391-a316c200-2d51-11ea-9cef-52758cab85e3.png) #[allow(missing_debug_implementations)] -pub struct Progressbar { +pub struct ProgressBar { range: RangeInclusive, value: f32, width: Length, + height: Length, background: Option, active_color: Option, } -impl Progressbar { - /// Creates a new [`Progressbar`]. +impl ProgressBar { + /// Creates a new [`ProgressBar`]. /// /// It expects: /// * an inclusive range of possible values - /// * the current value of the [`Progressbar`] + /// * the current value of the [`ProgressBar`] /// - /// [`Progressbar`]: struct.Progressbar.html + /// [`ProgressBar`]: struct.ProgressBar.html pub fn new(range: RangeInclusive, value: f32) -> Self { - Progressbar { + ProgressBar { value: value.max(*range.start()).min(*range.end()), range, width: Length::Fill, + height: DEFAULT_HEIGHT, background: None, active_color: None, } } - /// Sets the width of the [`Progressbar`]. + /// Sets the width of the [`ProgressBar`]. /// - /// [`Progressbar`]: struct.Progressbar.html + /// [`ProgressBar`]: struct.ProgressBar.html pub fn width(mut self, width: Length) -> Self { self.width = width; self } - /// Sets the background of the [`Progressbar`]. + /// Sets the height of the [`ProgressBar`]. + /// + /// [`ProgressBar`]: struct.ProgressBar.html + pub fn height(mut self, height: Length) -> Self { + self.height = height; + self + } + + /// Sets the background of the [`ProgressBar`]. /// - /// [`Progressbar`]: struct.Progressbar.html + /// [`ProgressBar`]: struct.ProgressBar.html pub fn background(mut self, background: Background) -> Self { self.background = Some(background); self } - /// Sets the active color of the [`Progressbar`]. + /// Sets the active color of the [`ProgressBar`]. /// - /// [`Progressbar`]: struct.Progressbar.html + /// [`ProgressBar`]: struct.ProgressBar.html pub fn active_color(mut self, active_color: Color) -> Self { self.active_color = Some(active_color); self } } -impl Widget for Progressbar +impl Widget for ProgressBar where Renderer: self::Renderer, { @@ -82,17 +94,15 @@ where } fn height(&self) -> Length { - Length::Shrink + self.height } fn layout( &self, - renderer: &Renderer, + _renderer: &Renderer, limits: &layout::Limits, ) -> layout::Node { - let limits = limits - .width(self.width) - .height(Length::Units(renderer.height() as u16)); + let limits = limits.width(self.width).height(self.height); let size = limits.resolve(Size::ZERO); @@ -119,30 +129,25 @@ where } } -/// The renderer of a [`Progressbar`]. +/// The renderer of a [`ProgressBar`]. /// /// Your [renderer] will need to implement this trait before being -/// able to use a [`Progressbar`] in your user interface. +/// able to use a [`ProgressBar`] in your user interface. /// -/// [`Progressbar`]: struct.Progressbar.html +/// [`ProgressBar`]: struct.ProgressBar.html /// [renderer]: ../../renderer/index.html pub trait Renderer: crate::Renderer { - /// Returns the height of the [`Progressbar`]. - /// - /// [`Progressbar`]: struct.Progressbar.html - fn height(&self) -> u32; - - /// Draws a [`Progressbar`]. + /// Draws a [`ProgressBar`]. /// /// It receives: - /// * the local state of the [`Progressbar`] - /// * the bounds of the [`Progressbar`] - /// * the range of values of the [`Progressbar`] - /// * the current value of the [`Progressbar`] - /// * maybe a specific background of the [`Progressbar`] - /// * maybe a specific active color of the [`Progressbar`] + /// * the local state of the [`ProgressBar`] + /// * the bounds of the [`ProgressBar`] + /// * the range of values of the [`ProgressBar`] + /// * the current value of the [`ProgressBar`] + /// * maybe a specific background of the [`ProgressBar`] + /// * maybe a specific active color of the [`ProgressBar`] /// - /// [`Progressbar`]: struct.Progressbar.html + /// [`ProgressBar`]: struct.ProgressBar.html /// [`State`]: struct.State.html /// [`Class`]: enum.Class.html fn draw( @@ -155,12 +160,12 @@ pub trait Renderer: crate::Renderer { ) -> Self::Output; } -impl<'a, Message, Renderer> From for Element<'a, Message, Renderer> +impl<'a, Message, Renderer> From for Element<'a, Message, Renderer> where Renderer: self::Renderer, Message: 'static, { - fn from(progressbar: Progressbar) -> Element<'a, Message, Renderer> { + fn from(progressbar: ProgressBar) -> Element<'a, Message, Renderer> { Element::new(progressbar) } } diff --git a/wgpu/src/renderer/widget.rs b/wgpu/src/renderer/widget.rs index 94ebd10ec8..32187c1056 100644 --- a/wgpu/src/renderer/widget.rs +++ b/wgpu/src/renderer/widget.rs @@ -2,7 +2,7 @@ mod button; mod checkbox; mod column; mod image; -mod progressbar; +mod progress_bar; mod radio; mod row; mod scrollable; diff --git a/wgpu/src/renderer/widget/progressbar.rs b/wgpu/src/renderer/widget/progress_bar.rs similarity index 88% rename from wgpu/src/renderer/widget/progressbar.rs rename to wgpu/src/renderer/widget/progress_bar.rs index f621343de8..3550df23f0 100644 --- a/wgpu/src/renderer/widget/progressbar.rs +++ b/wgpu/src/renderer/widget/progress_bar.rs @@ -1,11 +1,7 @@ use crate::{Primitive, Renderer}; -use iced_native::{progressbar, Background, Color, MouseCursor, Rectangle}; - -impl progressbar::Renderer for Renderer { - fn height(&self) -> u32 { - 30 - } +use iced_native::{progress_bar, Background, Color, MouseCursor, Rectangle}; +impl progress_bar::Renderer for Renderer { fn draw( &self, bounds: Rectangle, From 0b663ca82aa4fccb95ada3dd01d82cbaec6acc24 Mon Sep 17 00:00:00 2001 From: Songtronix Date: Fri, 3 Jan 2020 16:41:16 +0100 Subject: [PATCH 4/7] add(web): support password field --- web/src/widget/text_input.rs | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/web/src/widget/text_input.rs b/web/src/widget/text_input.rs index 99792c8416..eedc25bc4f 100644 --- a/web/src/widget/text_input.rs +++ b/web/src/widget/text_input.rs @@ -32,6 +32,7 @@ pub struct TextInput<'a, Message> { _state: &'a mut State, placeholder: String, value: String, + is_secure: bool, width: Length, max_width: Length, padding: u16, @@ -64,6 +65,7 @@ impl<'a, Message> TextInput<'a, Message> { _state: state, placeholder: String::from(placeholder), value: String::from(value), + is_secure: false, width: Length::Fill, max_width: Length::Shrink, padding: 0, @@ -73,6 +75,14 @@ impl<'a, Message> TextInput<'a, Message> { } } + /// Converts the [`TextInput`] into a secure password input. + /// + /// [`TextInput`]: struct.TextInput.html + pub fn password(mut self) -> Self { + self.is_secure = true; + self + } + /// Sets the width of the [`TextInput`]. /// /// [`TextInput`]: struct.TextInput.html @@ -161,6 +171,10 @@ where "value", bumpalo::format!(in bump, "{}", self.value).into_bump_str(), ) + .attr( + "type", + bumpalo::format!(in bump, "{}", if self.is_secure { "password" } else { "text" }).into_bump_str(), + ) .on("input", move |root, vdom, event| { let text_input = match event.target().and_then(|t| { t.dyn_into::().ok() From 9116afaf59f5ea697bed55ed3d11e2afd76ad4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 3 Jan 2020 18:23:19 +0100 Subject: [PATCH 5/7] Move `DEFAULT_HEIGHT` constant to `Renderer` Also fixes some minor documentation issues. --- native/src/widget/progress_bar.rs | 39 ++++++++++++------------ wgpu/src/renderer/widget/progress_bar.rs | 2 ++ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/native/src/widget/progress_bar.rs b/native/src/widget/progress_bar.rs index f9b8702682..d61ec4f288 100644 --- a/native/src/widget/progress_bar.rs +++ b/native/src/widget/progress_bar.rs @@ -1,7 +1,4 @@ -//! Display a ProgressBar -//! -//! -//! [`ProgressBar`]: struct.ProgressBar.html +//! Provide progress feedback to your users. use crate::{ layout, Background, Color, Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget, @@ -9,26 +6,24 @@ use crate::{ use std::{hash::Hash, ops::RangeInclusive}; -const DEFAULT_HEIGHT: Length = Length::Units(30); - -/// A ProgressBar +/// A bar that displays progress. /// /// # Example -/// /// ``` /// # use iced_native::ProgressBar; -/// +/// # /// let value = 50.0; +/// /// ProgressBar::new(0.0..=100.0, value); /// ``` /// -/// ![Default ProgressBar](https://user-images.githubusercontent.com/18618951/71662391-a316c200-2d51-11ea-9cef-52758cab85e3.png) +/// ![Progress bar drawn with `iced_wgpu`](https://user-images.githubusercontent.com/18618951/71662391-a316c200-2d51-11ea-9cef-52758cab85e3.png) #[allow(missing_debug_implementations)] pub struct ProgressBar { range: RangeInclusive, value: f32, width: Length, - height: Length, + height: Option, background: Option, active_color: Option, } @@ -46,7 +41,7 @@ impl ProgressBar { value: value.max(*range.start()).min(*range.end()), range, width: Length::Fill, - height: DEFAULT_HEIGHT, + height: None, background: None, active_color: None, } @@ -64,7 +59,7 @@ impl ProgressBar { /// /// [`ProgressBar`]: struct.ProgressBar.html pub fn height(mut self, height: Length) -> Self { - self.height = height; + self.height = Some(height); self } @@ -95,6 +90,7 @@ where fn height(&self) -> Length { self.height + .unwrap_or(Length::Units(Renderer::DEFAULT_HEIGHT)) } fn layout( @@ -102,7 +98,10 @@ where _renderer: &Renderer, limits: &layout::Limits, ) -> layout::Node { - let limits = limits.width(self.width).height(self.height); + let limits = limits.width(self.width).height( + self.height + .unwrap_or(Length::Units(Renderer::DEFAULT_HEIGHT)), + ); let size = limits.resolve(Size::ZERO); @@ -137,10 +136,14 @@ where /// [`ProgressBar`]: struct.ProgressBar.html /// [renderer]: ../../renderer/index.html pub trait Renderer: crate::Renderer { + /// The default height of a [`ProgressBar`]. + /// + /// [`ProgressBar`]: struct.ProgressBar.html + const DEFAULT_HEIGHT: u16; + /// Draws a [`ProgressBar`]. /// /// It receives: - /// * the local state of the [`ProgressBar`] /// * the bounds of the [`ProgressBar`] /// * the range of values of the [`ProgressBar`] /// * the current value of the [`ProgressBar`] @@ -148,8 +151,6 @@ pub trait Renderer: crate::Renderer { /// * maybe a specific active color of the [`ProgressBar`] /// /// [`ProgressBar`]: struct.ProgressBar.html - /// [`State`]: struct.State.html - /// [`Class`]: enum.Class.html fn draw( &self, bounds: Rectangle, @@ -165,7 +166,7 @@ where Renderer: self::Renderer, Message: 'static, { - fn from(progressbar: ProgressBar) -> Element<'a, Message, Renderer> { - Element::new(progressbar) + fn from(progress_bar: ProgressBar) -> Element<'a, Message, Renderer> { + Element::new(progress_bar) } } diff --git a/wgpu/src/renderer/widget/progress_bar.rs b/wgpu/src/renderer/widget/progress_bar.rs index 3550df23f0..8ed4bab770 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, From 60ac4faca0e61ddebaa89c0535390cc3f1180a39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Fri, 3 Jan 2020 18:33:47 +0100 Subject: [PATCH 6/7] Hash `height` of `ProgressBar` in `hash_layout` --- native/src/widget/progress_bar.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/native/src/widget/progress_bar.rs b/native/src/widget/progress_bar.rs index d61ec4f288..b1d4fd922b 100644 --- a/native/src/widget/progress_bar.rs +++ b/native/src/widget/progress_bar.rs @@ -125,6 +125,7 @@ where fn hash_layout(&self, state: &mut Hasher) { self.width.hash(state); + self.height.hash(state); } } From 43de28ae1515ace34758656f228444898459d85b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A9ctor=20Ram=C3=B3n=20Jim=C3=A9nez?= Date: Sat, 4 Jan 2020 14:14:28 +0100 Subject: [PATCH 7/7] Expose `ProgressBar` in `iced` crate --- examples/progress_bar.rs | 3 +-- src/native.rs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/examples/progress_bar.rs b/examples/progress_bar.rs index 56f5490316..525019b4b5 100644 --- a/examples/progress_bar.rs +++ b/examples/progress_bar.rs @@ -1,8 +1,7 @@ use iced::{ settings::Window, slider, Background, Color, Column, Element, Length, - Sandbox, Settings, Slider, + ProgressBar, Sandbox, Settings, Slider, }; -use iced_winit::ProgressBar; pub fn main() { Progress::run(Settings { diff --git a/src/native.rs b/src/native.rs index cf48a391c3..022cf33705 100644 --- a/src/native.rs +++ b/src/native.rs @@ -85,7 +85,7 @@ pub mod widget { pub use iced_winit::svg::{Handle, Svg}; } - pub use iced_winit::{Checkbox, Radio, Text}; + pub use iced_winit::{Checkbox, ProgressBar, Radio, Text}; #[doc(no_inline)] pub use {