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

Introduce theme::Custom::with_fn to generate completely custom themes

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-09-03 01:32:47 +02:00
parent 9b9b37e6f8
commit 832d9f1b01
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
1 changed files with 22 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

27
style/src/theme.rs
View file

@ -1,8 +1,7 @@
//! Use the built-in theme and styles. //! Use the built-in theme and styles.
pub mod palette; pub mod palette;
use self::palette::Extended; pub use palette::Palette;
pub use self::palette::Palette;
use crate::application; use crate::application;
use crate::button; use crate::button;
@ -40,7 +39,16 @@ pub enum Theme {
impl Theme { impl Theme {
/// Creates a new custom [`Theme`] from the given [`Palette`]. /// Creates a new custom [`Theme`] from the given [`Palette`].
pub fn custom(palette: Palette) -> Self { pub fn custom(palette: Palette) -> Self {
Self::Custom(Box::new(Custom::new(palette))) Self::custom_with_fn(palette, palette::Extended::generate)
}
/// Creates a new custom [`Theme`] from the given [`Palette`], with
/// a custom generator of a [`palette::Extended`].
pub fn custom_with_fn(
palette: Palette,
generate: impl FnOnce(Palette) -> palette::Extended,
) -> Self {
Self::Custom(Box::new(Custom::with_fn(palette, generate)))
} }
/// Returns the [`Palette`] of the [`Theme`]. /// Returns the [`Palette`] of the [`Theme`].
@ -66,15 +74,24 @@ impl Theme {
#[derive(Debug, Clone, Copy, PartialEq)] #[derive(Debug, Clone, Copy, PartialEq)]
pub struct Custom { pub struct Custom {
palette: Palette, palette: Palette,
extended: Extended, extended: palette::Extended,
} }
impl Custom { impl Custom {
/// Creates a [`Custom`] theme from the given [`Palette`]. /// Creates a [`Custom`] theme from the given [`Palette`].
pub fn new(palette: Palette) -> Self { pub fn new(palette: Palette) -> Self {
Self::with_fn(palette, palette::Extended::generate)
}
/// Creates a [`Custom`] theme from the given [`Palette`] with
/// a custom generator of a [`palette::Extended`].
pub fn with_fn(
palette: Palette,
generate: impl FnOnce(Palette) -> palette::Extended,
) -> Self {
Self { Self {
palette, palette,
extended: Extended::generate(palette), extended: generate(palette),
} }
} }
} }