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

Enhnace Themer to allow derivation from current Theme

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-03-04 19:32:20 +01:00
parent 4130ae4be9
commit db92e1c942
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
2 changed files with 80 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

13
widget/src/helpers.rs
View file

@ -15,7 +15,6 @@ use crate::rule::{self, Rule};
use crate::runtime::Command; use crate::runtime::Command;
use crate::scrollable::{self, Scrollable}; use crate::scrollable::{self, Scrollable};
use crate::slider::{self, Slider}; use crate::slider::{self, Slider};
use crate::style::application;
use crate::text::{self, Text}; use crate::text::{self, Text};
use crate::text_editor::{self, TextEditor}; use crate::text_editor::{self, TextEditor};
use crate::text_input::{self, TextInput}; use crate::text_input::{self, TextInput};
@ -440,13 +439,13 @@ where
} }
/// A widget that applies any `Theme` to its contents. /// A widget that applies any `Theme` to its contents.
pub fn themer<'a, Message, Theme, Renderer>( pub fn themer<'a, Message, OldTheme, NewTheme, F, Renderer>(
theme: Theme, to_theme: F,
content: impl Into<Element<'a, Message, Theme, Renderer>>, content: impl Into<Element<'a, Message, NewTheme, Renderer>>,
) -> Themer<'a, Message, Theme, Renderer> ) -> Themer<'a, Message, OldTheme, NewTheme, F, Renderer>
where where
F: Fn(&OldTheme) -> NewTheme,
Renderer: core::Renderer, Renderer: core::Renderer,
Theme: application::StyleSheet,
{ {
Themer::new(theme, content) Themer::new(to_theme, content)
} }

133
widget/src/themer.rs
View file

@ -7,58 +7,68 @@ use crate::core::renderer;
use crate::core::widget::tree::{self, Tree}; use crate::core::widget::tree::{self, Tree};
use crate::core::widget::Operation; use crate::core::widget::Operation;
use crate::core::{ use crate::core::{
Background, Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Background, Clipboard, Color, Element, Layout, Length, Point, Rectangle,
Size, Vector, Widget, Shell, Size, Vector, Widget,
}; };
use crate::style::application;
use std::marker::PhantomData;
/// A widget that applies any `Theme` to its contents. /// A widget that applies any `Theme` to its contents.
/// ///
/// This widget can be useful to leverage multiple `Theme` /// This widget can be useful to leverage multiple `Theme`
/// types in an application. /// types in an application.
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct Themer<'a, Message, Theme, Renderer> pub struct Themer<'a, Message, Theme, NewTheme, F, Renderer = crate::Renderer>
where where
F: Fn(&Theme) -> NewTheme,
Renderer: crate::core::Renderer, Renderer: crate::core::Renderer,
Theme: application::StyleSheet,
{ {
content: Element<'a, Message, Theme, Renderer>, content: Element<'a, Message, NewTheme, Renderer>,
theme: Theme, to_theme: F,
style: Theme::Style, text_color: Option<fn(&NewTheme) -> Color>,
show_background: bool, background: Option<fn(&NewTheme) -> Background>,
old_theme: PhantomData<Theme>,
} }
impl<'a, Message, Theme, Renderer> Themer<'a, Message, Theme, Renderer> impl<'a, Message, Theme, NewTheme, F, Renderer>
Themer<'a, Message, Theme, NewTheme, F, Renderer>
where where
F: Fn(&Theme) -> NewTheme,
Renderer: crate::core::Renderer, Renderer: crate::core::Renderer,
Theme: application::StyleSheet,
{ {
/// Creates an empty [`Themer`] that applies the given `Theme` /// Creates an empty [`Themer`] that applies the given `Theme`
/// to the provided `content`. /// to the provided `content`.
pub fn new<T>(theme: Theme, content: T) -> Self pub fn new<T>(to_theme: F, content: T) -> Self
where where
T: Into<Element<'a, Message, Theme, Renderer>>, T: Into<Element<'a, Message, NewTheme, Renderer>>,
{ {
Self { Self {
content: content.into(), content: content.into(),
theme, to_theme,
style: Theme::Style::default(), text_color: None,
show_background: false, background: None,
old_theme: PhantomData,
} }
} }
/// Sets whether to draw the background color of the `Theme`. /// Sets the default text [`Color`] of the [`Themer`].
pub fn background(mut self, background: bool) -> Self { pub fn text_color(mut self, f: fn(&NewTheme) -> Color) -> Self {
self.show_background = background; self.text_color = Some(f);
self
}
/// Sets the [`Background`] of the [`Themer`].
pub fn background(mut self, f: fn(&NewTheme) -> Background) -> Self {
self.background = Some(f);
self self
} }
} }
impl<'a, AnyTheme, Message, Theme, Renderer> Widget<Message, AnyTheme, Renderer> impl<'a, Message, Theme, NewTheme, F, Renderer> Widget<Message, Theme, Renderer>
for Themer<'a, Message, Theme, Renderer> for Themer<'a, Message, Theme, NewTheme, F, Renderer>
where where
F: Fn(&Theme) -> NewTheme,
Renderer: crate::core::Renderer, Renderer: crate::core::Renderer,
Theme: application::StyleSheet,
{ {
fn tag(&self) -> tree::Tag { fn tag(&self) -> tree::Tag {
self.content.as_widget().tag() self.content.as_widget().tag()
@ -134,38 +144,36 @@ where
&self, &self,
tree: &Tree, tree: &Tree,
renderer: &mut Renderer, renderer: &mut Renderer,
_theme: &AnyTheme, theme: &Theme,
_style: &renderer::Style, style: &renderer::Style,
layout: Layout<'_>, layout: Layout<'_>,
cursor: mouse::Cursor, cursor: mouse::Cursor,
viewport: &Rectangle, viewport: &Rectangle,
) { ) {
let appearance = self.theme.appearance(&self.style); let theme = (self.to_theme)(theme);
if self.show_background { if let Some(background) = self.background {
container::draw_background( container::draw_background(
renderer, renderer,
&container::Appearance { &container::Appearance {
background: Some(Background::Color( background: Some(background(&theme)),
appearance.background_color,
)),
..container::Appearance::default() ..container::Appearance::default()
}, },
layout.bounds(), layout.bounds(),
); );
} }
self.content.as_widget().draw( let style = if let Some(text_color) = self.text_color {
tree, renderer::Style {
renderer, text_color: text_color(&theme),
&self.theme, }
&renderer::Style { } else {
text_color: appearance.text_color, *style
}, };
layout,
cursor, self.content
viewport, .as_widget()
); .draw(tree, renderer, &theme, &style, layout, cursor, viewport);
} }
fn overlay<'b>( fn overlay<'b>(
@ -174,15 +182,15 @@ where
layout: Layout<'_>, layout: Layout<'_>,
renderer: &Renderer, renderer: &Renderer,
translation: Vector, translation: Vector,
) -> Option<overlay::Element<'b, Message, AnyTheme, Renderer>> { ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
struct Overlay<'a, Message, Theme, Renderer> { struct Overlay<'a, Message, Theme, NewTheme, Renderer> {
theme: &'a Theme, to_theme: &'a dyn Fn(&Theme) -> NewTheme,
content: overlay::Element<'a, Message, Theme, Renderer>, content: overlay::Element<'a, Message, NewTheme, Renderer>,
} }
impl<'a, AnyTheme, Message, Theme, Renderer> impl<'a, Message, Theme, NewTheme, Renderer>
overlay::Overlay<Message, AnyTheme, Renderer> overlay::Overlay<Message, Theme, Renderer>
for Overlay<'a, Message, Theme, Renderer> for Overlay<'a, Message, Theme, NewTheme, Renderer>
where where
Renderer: crate::core::Renderer, Renderer: crate::core::Renderer,
{ {
@ -197,13 +205,18 @@ where
fn draw( fn draw(
&self, &self,
renderer: &mut Renderer, renderer: &mut Renderer,
_theme: &AnyTheme, theme: &Theme,
style: &renderer::Style, style: &renderer::Style,
layout: Layout<'_>, layout: Layout<'_>,
cursor: mouse::Cursor, cursor: mouse::Cursor,
) { ) {
self.content self.content.draw(
.draw(renderer, self.theme, style, layout, cursor); renderer,
&(self.to_theme)(theme),
style,
layout,
cursor,
);
} }
fn on_event( fn on_event(
@ -252,12 +265,12 @@ where
&'b mut self, &'b mut self,
layout: Layout<'_>, layout: Layout<'_>,
renderer: &Renderer, renderer: &Renderer,
) -> Option<overlay::Element<'b, Message, AnyTheme, Renderer>> ) -> Option<overlay::Element<'b, Message, Theme, Renderer>>
{ {
self.content self.content
.overlay(layout, renderer) .overlay(layout, renderer)
.map(|content| Overlay { .map(|content| Overlay {
theme: self.theme, to_theme: &self.to_theme,
content, content,
}) })
.map(|overlay| overlay::Element::new(Box::new(overlay))) .map(|overlay| overlay::Element::new(Box::new(overlay)))
@ -268,24 +281,26 @@ where
.as_widget_mut() .as_widget_mut()
.overlay(tree, layout, renderer, translation) .overlay(tree, layout, renderer, translation)
.map(|content| Overlay { .map(|content| Overlay {
theme: &self.theme, to_theme: &self.to_theme,
content, content,
}) })
.map(|overlay| overlay::Element::new(Box::new(overlay))) .map(|overlay| overlay::Element::new(Box::new(overlay)))
} }
} }
impl<'a, AnyTheme, Message, Theme, Renderer> impl<'a, Message, Theme, NewTheme, F, Renderer>
From<Themer<'a, Message, Theme, Renderer>> From<Themer<'a, Message, Theme, NewTheme, F, Renderer>>
for Element<'a, Message, AnyTheme, Renderer> for Element<'a, Message, Theme, Renderer>
where where
Message: 'a, Message: 'a,
Theme: 'a + application::StyleSheet, Theme: 'a,
NewTheme: 'a,
F: Fn(&Theme) -> NewTheme + 'a,
Renderer: 'a + crate::core::Renderer, Renderer: 'a + crate::core::Renderer,
{ {
fn from( fn from(
themer: Themer<'a, Message, Theme, Renderer>, themer: Themer<'a, Message, Theme, NewTheme, F, Renderer>,
) -> Element<'a, Message, AnyTheme, Renderer> { ) -> Element<'a, Message, Theme, Renderer> {
Element::new(themer) Element::new(themer)
} }
} }