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

Leverage DefaultStyle traits instead of Default

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2024-03-07 20:11:32 +01:00
parent 44f002f64a
commit 833538ee7f
No known key found for this signature in database
GPG key ID: 7CC46565708259A7
30 changed files with 393 additions and 437 deletions
Download patch file Download diff file Expand all files Collapse all files

30
widget/src/combo_box.rs
View file

@ -62,9 +62,9 @@ where
on_selected: impl Fn(T) -> Message + 'static,
) -> Self
where
Style<Theme>: Default,
Theme: DefaultStyle,
{
let style = Style::<Theme>::default();
let style = Theme::default_style();
let text_input = TextInput::with_style(
placeholder,
@ -762,7 +762,7 @@ where
.collect()
}
/// The appearance of a [`ComboBox`].
/// The style of a [`ComboBox`].
#[derive(Debug, PartialEq, Eq)]
pub struct Style<Theme> {
/// The style of the [`TextInput`] of the [`ComboBox`].
@ -772,6 +772,14 @@ pub struct Style<Theme> {
menu: menu::Style<Theme>,
}
impl Style<Theme> {
/// The default style of a [`ComboBox`].
pub const DEFAULT: Self = Self {
text_input: text_input::default,
menu: menu::Style::<Theme>::DEFAULT,
};
}
impl<Theme> Clone for Style<Theme> {
fn clone(&self) -> Self {
*self
@ -780,16 +788,14 @@ impl<Theme> Clone for Style<Theme> {
impl<Theme> Copy for Style<Theme> {}
impl Default for Style<Theme> {
fn default() -> Self {
default()
}
/// The default style of a [`ComboBox`].
pub trait DefaultStyle: Sized {
/// Returns the default style of a [`ComboBox`].
fn default_style() -> Style<Self>;
}
/// The default style of a [`ComboBox`].
pub fn default() -> Style<Theme> {
Style {
text_input: text_input::default,
menu: menu::Style::default(),
impl DefaultStyle for Theme {
fn default_style() -> Style<Self> {
Style::<Self>::DEFAULT
}
}