From 3efb59dea3d206a9d627ce5a7a7a93c00d769ba8 Mon Sep 17 00:00:00 2001 From: Héctor Ramón Jiménez Date: Thu, 10 Mar 2022 17:01:57 +0700 Subject: Implement `pure` version of `ProgressBar` widget --- pure/src/widget.rs | 15 +++++++ pure/src/widget/progress_bar.rs | 99 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 pure/src/widget/progress_bar.rs (limited to 'pure') diff --git a/pure/src/widget.rs b/pure/src/widget.rs index bee21633..8f2cf920 100644 --- a/pure/src/widget.rs +++ b/pure/src/widget.rs @@ -1,4 +1,5 @@ pub mod image; +pub mod progress_bar; pub mod rule; pub mod tree; @@ -24,6 +25,7 @@ pub use container::Container; pub use element::Element; pub use image::Image; pub use pick_list::PickList; +pub use progress_bar::ProgressBar; pub use radio::Radio; pub use row::Row; pub use rule::Rule; @@ -43,6 +45,7 @@ use iced_native::renderer; use iced_native::{Clipboard, Length, Point, Rectangle, Shell}; use std::borrow::Cow; +use std::ops::RangeInclusive; pub trait Widget { fn width(&self) -> Length; @@ -246,3 +249,15 @@ pub fn horizontal_rule<'a>(height: u16) -> Rule<'a> { pub fn vertical_rule<'a>(width: u16) -> Rule<'a> { Rule::horizontal(width) } + +/// Creates a new [`ProgressBar`]. +/// +/// It expects: +/// * an inclusive range of possible values +/// * the current value of the [`ProgressBar`] +pub fn progress_bar<'a>( + range: RangeInclusive, + value: f32, +) -> ProgressBar<'a> { + ProgressBar::new(range, value) +} diff --git a/pure/src/widget/progress_bar.rs b/pure/src/widget/progress_bar.rs new file mode 100644 index 00000000..9b996f02 --- /dev/null +++ b/pure/src/widget/progress_bar.rs @@ -0,0 +1,99 @@ +use crate::{Element, Tree, Widget}; + +use iced_native::event::{self, Event}; +use iced_native::layout::{self, Layout}; +use iced_native::mouse; +use iced_native::renderer; +use iced_native::{Clipboard, Length, Point, Rectangle, Shell}; + +pub use iced_native::widget::progress_bar::*; + +impl<'a, Message, Renderer> Widget for ProgressBar<'a> +where + Renderer: iced_native::Renderer, +{ + fn width(&self) -> Length { + >::width(self) + } + + fn height(&self) -> Length { + >::height(self) + } + + fn layout( + &self, + renderer: &Renderer, + limits: &layout::Limits, + ) -> layout::Node { + >::layout( + self, renderer, limits, + ) + } + + fn on_event( + &mut self, + _state: &mut Tree, + event: Event, + layout: Layout<'_>, + cursor_position: Point, + renderer: &Renderer, + clipboard: &mut dyn Clipboard, + shell: &mut Shell<'_, Message>, + ) -> event::Status { + >::on_event( + self, + event, + layout, + cursor_position, + renderer, + clipboard, + shell, + ) + } + + fn draw( + &self, + _tree: &Tree, + renderer: &mut Renderer, + style: &renderer::Style, + layout: Layout<'_>, + cursor_position: Point, + viewport: &Rectangle, + ) { + >::draw( + self, + renderer, + style, + layout, + cursor_position, + viewport, + ) + } + + fn mouse_interaction( + &self, + _state: &Tree, + layout: Layout<'_>, + cursor_position: Point, + viewport: &Rectangle, + renderer: &Renderer, + ) -> mouse::Interaction { + >::mouse_interaction( + self, + layout, + cursor_position, + viewport, + renderer, + ) + } +} + +impl<'a, Message, Renderer> Into> + for ProgressBar<'a> +where + Renderer: iced_native::Renderer + 'a, +{ + fn into(self) -> Element<'a, Message, Renderer> { + Element::new(self) + } +} -- cgit