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

Introduce state lifetime for style_sheet in Toggler

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2021-10-31 17:48:23 +07:00
parent 0d3c9ef7bd
commit c9ed15782c
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
5 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

3
glow/src/widget/toggler.rs
View file

@ -6,4 +6,5 @@ pub use iced_graphics::toggler::{Style, StyleSheet};
/// A toggler that can be toggled. /// A toggler that can be toggled.
/// ///
/// This is an alias of an `iced_native` checkbox with an `iced_wgpu::Renderer`. /// This is an alias of an `iced_native` checkbox with an `iced_wgpu::Renderer`.
pub type Toggler<Message> = iced_native::widget::Toggler<Message, Renderer>; pub type Toggler<'a, Message> =
iced_native::widget::Toggler<'a, Message, Renderer>;

4
graphics/src/widget/toggler.rs
View file

@ -6,5 +6,5 @@ pub use iced_style::toggler::{Style, StyleSheet};
/// A toggler that can be toggled. /// A toggler that can be toggled.
/// ///
/// This is an alias of an `iced_native` toggler with an `iced_wgpu::Renderer`. /// This is an alias of an `iced_native` toggler with an `iced_wgpu::Renderer`.
pub type Toggler<Message, Backend> = pub type Toggler<'a, Message, Backend> =
iced_native::widget::Toggler<Message, Renderer<Backend>>; iced_native::widget::Toggler<'a, Message, Renderer<Backend>>;

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

@ -31,7 +31,7 @@ pub use iced_style::toggler::{Style, StyleSheet};
/// Toggler::new(is_active, String::from("Toggle me!"), |b| Message::TogglerToggled(b)); /// Toggler::new(is_active, String::from("Toggle me!"), |b| Message::TogglerToggled(b));
/// ``` /// ```
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct Toggler<Message, Renderer: text::Renderer> { pub struct Toggler<'a, Message, Renderer: text::Renderer> {
is_active: bool, is_active: bool,
on_toggle: Box<dyn Fn(bool) -> Message>, on_toggle: Box<dyn Fn(bool) -> Message>,
label: Option<String>, label: Option<String>,
@ -41,10 +41,10 @@ pub struct Toggler<Message, Renderer: text::Renderer> {
text_alignment: alignment::Horizontal, text_alignment: alignment::Horizontal,
spacing: u16, spacing: u16,
font: Renderer::Font, font: Renderer::Font,
style_sheet: Box<dyn StyleSheet>, style_sheet: Box<dyn StyleSheet + 'a>,
} }
impl<Message, Renderer: text::Renderer> Toggler<Message, Renderer> { impl<'a, Message, Renderer: text::Renderer> Toggler<'a, Message, Renderer> {
/// The default size of a [`Toggler`]. /// The default size of a [`Toggler`].
pub const DEFAULT_SIZE: u16 = 20; pub const DEFAULT_SIZE: u16 = 20;
@ -117,14 +117,15 @@ impl<Message, Renderer: text::Renderer> Toggler<Message, Renderer> {
/// Sets the style of the [`Toggler`]. /// Sets the style of the [`Toggler`].
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 Toggler<Message, Renderer> impl<'a, Message, Renderer> Widget<Message, Renderer>
for Toggler<'a, Message, Renderer>
where where
Renderer: text::Renderer, Renderer: text::Renderer,
{ {
@ -294,14 +295,14 @@ where
} }
} }
impl<'a, Message, Renderer> From<Toggler<Message, Renderer>> impl<'a, Message, Renderer> From<Toggler<'a, Message, Renderer>>
for Element<'a, Message, Renderer> for Element<'a, Message, Renderer>
where where
Renderer: 'a + text::Renderer, Renderer: 'a + text::Renderer,
Message: 'a, Message: 'a,
{ {
fn from( fn from(
toggler: Toggler<Message, Renderer>, toggler: Toggler<'a, Message, Renderer>,
) -> Element<'a, Message, Renderer> { ) -> Element<'a, Message, Renderer> {
Element::new(toggler) Element::new(toggler)
} }

4
style/src/toggler.rs
View file

@ -47,9 +47,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)

3
wgpu/src/widget/toggler.rs
View file

@ -6,4 +6,5 @@ pub use iced_graphics::toggler::{Style, StyleSheet};
/// A toggler that can be toggled /// A toggler that can be toggled
/// ///
/// This is an alias of an `iced_native` toggler with an `iced_wgpu::Renderer`. /// This is an alias of an `iced_native` toggler with an `iced_wgpu::Renderer`.
pub type Toggler<Message> = iced_native::widget::Toggler<Message, Renderer>; pub type Toggler<'a, Message> =
iced_native::widget::Toggler<'a, Message, Renderer>;