Implement pure version of ProgressBar widget

This commit is contained in:
Héctor Ramón Jiménez 2022-03-10 17:01:57 +07:00
parent 0fbd1d98b5
commit 3efb59dea3
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 114 additions and 0 deletions

View file

@ -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<Message, Renderer> {
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<f32>,
value: f32,
) -> ProgressBar<'a> {
ProgressBar::new(range, value)
}

View file

@ -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<Message, Renderer> for ProgressBar<'a>
where
Renderer: iced_native::Renderer,
{
fn width(&self) -> Length {
<Self as iced_native::Widget<Message, Renderer>>::width(self)
}
fn height(&self) -> Length {
<Self as iced_native::Widget<Message, Renderer>>::height(self)
}
fn layout(
&self,
renderer: &Renderer,
limits: &layout::Limits,
) -> layout::Node {
<Self as iced_native::Widget<Message, Renderer>>::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 {
<Self as iced_native::Widget<Message, Renderer>>::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,
) {
<Self as iced_native::Widget<Message, Renderer>>::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 {
<Self as iced_native::Widget<Message, Renderer>>::mouse_interaction(
self,
layout,
cursor_position,
viewport,
renderer,
)
}
}
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
for ProgressBar<'a>
where
Renderer: iced_native::Renderer + 'a,
{
fn into(self) -> Element<'a, Message, Renderer> {
Element::new(self)
}
}