me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Introduce state lifetime for style_sheet in ProgressBar

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-10-31 17:08:19 +07:00
parent 6504dca059
commit d758006ee9
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
3 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

15
native/src/widget/progress_bar.rs
View file

@ -21,15 +21,15 @@ pub use iced_style::progress_bar::{Style, StyleSheet};
/// ///
/// ![Progress bar drawn with `iced_wgpu`](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)] #[allow(missing_debug_implementations)]
pub struct ProgressBar { pub struct ProgressBar<'a> {
range: RangeInclusive<f32>, range: RangeInclusive<f32>,
value: f32, value: f32,
width: Length, width: Length,
height: Option<Length>, height: Option<Length>,
style_sheet: Box<dyn StyleSheet>, style_sheet: Box<dyn StyleSheet + 'a>,
} }
impl ProgressBar { impl<'a> ProgressBar<'a> {
/// The default height of a [`ProgressBar`]. /// The default height of a [`ProgressBar`].
pub const DEFAULT_HEIGHT: u16 = 30; pub const DEFAULT_HEIGHT: u16 = 30;
@ -63,14 +63,14 @@ impl ProgressBar {
/// Sets the style of the [`ProgressBar`]. /// Sets the style of the [`ProgressBar`].
pub fn style( pub fn style(
mut self, mut self,
style_sheet: impl Into<Box<dyn StyleSheet>>, style_sheet: impl Into<Box<dyn StyleSheet + 'a>>,
) -> Self { ) -> Self {
self.style_sheet = style_sheet.into(); self.style_sheet = style_sheet.into();
self self
} }
} }
impl<Message, Renderer> Widget<Message, Renderer> for ProgressBar impl<'a, Message, Renderer> Widget<Message, Renderer> for ProgressBar<'a>
where where
Renderer: crate::Renderer, Renderer: crate::Renderer,
{ {
@ -147,12 +147,13 @@ where
} }
} }
impl<'a, Message, Renderer> From<ProgressBar> for Element<'a, Message, Renderer> impl<'a, Message, Renderer> From<ProgressBar<'a>>
for Element<'a, Message, Renderer>
where where
Renderer: 'a + crate::Renderer, Renderer: 'a + crate::Renderer,
Message: 'a, Message: 'a,
{ {
fn from(progress_bar: ProgressBar) -> Element<'a, Message, Renderer> { fn from(progress_bar: ProgressBar<'a>) -> Element<'a, Message, Renderer> {
Element::new(progress_bar) Element::new(progress_bar)
} }
} }

4
style/src/progress_bar.rs
View file

@ -32,9 +32,9 @@ impl std::default::Default for Box<dyn StyleSheet> {
} }
} }
impl<T> From<T> for Box<dyn StyleSheet> impl<'a, T> From<T> for Box<dyn StyleSheet + 'a>
where where
T: 'static + StyleSheet, T: 'a + StyleSheet,
{ {
fn from(style: T) -> Self { fn from(style: T) -> Self {
Box::new(style) Box::new(style)

12
web/src/widget/progress_bar.rs
View file

@ -18,15 +18,15 @@ use std::ops::RangeInclusive;
/// ///
/// ![Progress bar](https://user-images.githubusercontent.com/18618951/71662391-a316c200-2d51-11ea-9cef-52758cab85e3.png) /// ![Progress bar](https://user-images.githubusercontent.com/18618951/71662391-a316c200-2d51-11ea-9cef-52758cab85e3.png)
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct ProgressBar { pub struct ProgressBar<'a> {
range: RangeInclusive<f32>, range: RangeInclusive<f32>,
value: f32, value: f32,
width: Length, width: Length,
height: Option<Length>, height: Option<Length>,
style: Box<dyn StyleSheet>, style: Box<dyn StyleSheet + 'a>,
} }
impl ProgressBar { impl<'a> ProgressBar<'a> {
/// Creates a new [`ProgressBar`]. /// Creates a new [`ProgressBar`].
/// ///
/// It expects: /// It expects:
@ -61,7 +61,7 @@ impl ProgressBar {
} }
} }
impl<Message> Widget<Message> for ProgressBar { impl<'a, Message> Widget<Message> for ProgressBar<'a> {
fn node<'b>( fn node<'b>(
&self, &self,
bump: &'b bumpalo::Bump, bump: &'b bumpalo::Bump,
@ -106,11 +106,11 @@ impl<Message> Widget<Message> for ProgressBar {
} }
} }
impl<'a, Message> From<ProgressBar> for Element<'a, Message> impl<'a, Message> From<ProgressBar<'a>> for Element<'a, Message>
where where
Message: 'static, Message: 'static,
{ {
fn from(container: ProgressBar) -> Element<'a, Message> { fn from(container: ProgressBar<'a>) -> Element<'a, Message> {
Element::new(container) Element::new(container)
} }
} }