Skip to content

Commit

Permalink
Use closures for PickList::style
Browse files Browse the repository at this point in the history
  • Loading branch information
@hecrj
hecrj committed Mar 12, 2024
1 parent 3e190b9 commit b721fd9
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 95 deletions.
20 changes: 10 additions & 10 deletions widget/src/combo_box.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub struct ComboBox<
on_option_hovered: Option<Box<dyn Fn(T) -> Message>>,
on_close: Option<Message>,
on_input: Option<Box<dyn Fn(String) -> Message>>,
menu_style: menu::Style<Theme>,
menu_style: menu::Style<'a, Theme>,
padding: Padding,
size: Option<f32>,
}
Expand Down Expand Up @@ -125,7 +125,7 @@ where
}

/// Sets the style of the [`ComboBox`].
pub fn style(mut self, style: impl Into<Style<Theme>>) -> Self
pub fn style(mut self, style: impl Into<Style<'a, Theme>>) -> Self
where
Theme: 'a,
{
Expand Down Expand Up @@ -672,7 +672,7 @@ where

self.state.sync_filtered_options(filtered_options);

let mut menu = menu::Menu::with_style(
let mut menu = menu::Menu::new(
menu,
&filtered_options.options,
hovered_option,
Expand All @@ -686,7 +686,7 @@ where
(self.on_selected)(x)
},
self.on_option_hovered.as_deref(),
self.menu_style,
&self.menu_style,
)
.width(bounds.width)
.padding(self.padding);
Expand Down Expand Up @@ -765,27 +765,27 @@ where

/// The style of a [`ComboBox`].
#[allow(missing_debug_implementations)]
pub struct Style<Theme> {
pub struct Style<'a, Theme> {
/// The style of the [`TextInput`] of the [`ComboBox`].
pub text_input: text_input::Style<'static, Theme>,
pub text_input: text_input::Style<'a, Theme>,

/// The style of the [`Menu`] of the [`ComboBox`].
///
/// [`Menu`]: menu::Menu
pub menu: menu::Style<Theme>,
pub menu: menu::Style<'a, Theme>,
}

/// The default style of a [`ComboBox`].
pub trait DefaultStyle: Sized {
/// Returns the default style of a [`ComboBox`].
fn default_style() -> Style<Self>;
fn default_style() -> Style<'static, Self>;
}

impl DefaultStyle for Theme {
fn default_style() -> Style<Self> {
fn default_style() -> Style<'static, Self> {
Style {
text_input: Box::new(text_input::default),
menu: menu::Style::DEFAULT,
menu: menu::DefaultStyle::default_style(),
}
}
}
75 changes: 17 additions & 58 deletions widget/src/overlay/menu.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ pub struct Menu<
text_line_height: text::LineHeight,
text_shaping: text::Shaping,
font: Option<Renderer::Font>,
style: Style<Theme>,
style: &'a Style<'a, Theme>,
}

impl<'a, T, Message, Theme, Renderer> Menu<'a, T, Message, Theme, Renderer>
Expand All @@ -48,37 +48,15 @@ where
Theme: 'a,
Renderer: text::Renderer + 'a,
{
/// Creates a new [`Menu`] with the given [`State`], a list of options, and
/// the message to produced when an option is selected.
pub fn new(
state: &'a mut State,
options: &'a [T],
hovered_option: &'a mut Option<usize>,
on_selected: impl FnMut(T) -> Message + 'a,
on_option_hovered: Option<&'a dyn Fn(T) -> Message>,
) -> Self
where
Theme: DefaultStyle,
{
Self::with_style(
state,
options,
hovered_option,
on_selected,
on_option_hovered,
Theme::default_style(),
)
}

/// Creates a new [`Menu`] with the given [`State`], a list of options,
/// the message to produced when an option is selected, and its [`Style`].
pub fn with_style(
pub fn new(
state: &'a mut State,
options: &'a [T],
hovered_option: &'a mut Option<usize>,
on_selected: impl FnMut(T) -> Message + 'a,
on_option_hovered: Option<&'a dyn Fn(T) -> Message>,
style: Style<Theme>,
style: &'a Style<'a, Theme>,
) -> Self {
Menu {
state,
Expand Down Expand Up @@ -135,12 +113,6 @@ where
self
}

/// Sets the style of the [`Menu`].
pub fn style(mut self, style: impl Into<Style<Theme>>) -> Self {
self.style = style.into();
self
}

/// Turns the [`Menu`] into an overlay [`Element`] at the given target
/// position.
///
Expand Down Expand Up @@ -190,7 +162,7 @@ where
container: Container<'a, Message, Theme, Renderer>,
width: f32,
target_height: f32,
style: Style<Theme>,
style: &'a Style<'a, Theme>,
}

impl<'a, Message, Theme, Renderer> Overlay<'a, Message, Theme, Renderer>
Expand Down Expand Up @@ -234,10 +206,10 @@ where
text_line_height,
text_shaping,
padding,
style: style.list,
style: &style.list,
},
scrollable::Direction::default(),
style.scrollable,
&style.scrollable,
),
container::transparent,
);
Expand Down Expand Up @@ -356,7 +328,7 @@ where
text_line_height: text::LineHeight,
text_shaping: text::Shaping,
font: Option<Renderer::Font>,
style: fn(&Theme) -> Appearance,
style: &'a dyn Fn(&Theme) -> Appearance,
}

impl<'a, T, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
Expand Down Expand Up @@ -599,39 +571,26 @@ pub struct Appearance {
}

/// The style of the different parts of a [`Menu`].
#[derive(Debug, PartialEq, Eq)]
pub struct Style<Theme> {
#[allow(missing_debug_implementations)]
pub struct Style<'a, Theme> {
/// The style of the list of the [`Menu`].
pub list: fn(&Theme) -> Appearance,
pub list: Box<dyn Fn(&Theme) -> Appearance + 'a>,
/// The style of the [`Scrollable`] of the [`Menu`].
pub scrollable: fn(&Theme, scrollable::Status) -> scrollable::Appearance,
pub scrollable: scrollable::Style<'a, Theme>,
}

impl Style<Theme> {
/// The default style of a [`Menu`] with the built-in [`Theme`].
pub const DEFAULT: Self = Self {
list: default,
scrollable: scrollable::default,
};
}

impl<Theme> Clone for Style<Theme> {
fn clone(&self) -> Self {
*self
}
}

impl<Theme> Copy for Style<Theme> {}

/// The default style of a [`Menu`].
pub trait DefaultStyle: Sized {
/// Returns the default style of a [`Menu`].
fn default_style() -> Style<Self>;
fn default_style() -> Style<'static, Self>;
}

impl DefaultStyle for Theme {
fn default_style() -> Style<Self> {
Style::<Theme>::DEFAULT
fn default_style() -> Style<'static, Self> {
Style {
list: Box::new(default),
scrollable: Box::new(scrollable::default),
}
}
}

Expand Down
41 changes: 14 additions & 27 deletions widget/src/pick_list.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub struct PickList<
text_shaping: text::Shaping,
font: Option<Renderer::Font>,
handle: Handle<Renderer::Font>,
style: Style<Theme>,
style: Style<'a, Theme>,
}

impl<'a, T, L, V, Message, Theme, Renderer>
Expand Down Expand Up @@ -151,7 +151,7 @@ where
}

/// Sets the style of the [`PickList`].
pub fn style(mut self, style: impl Into<Style<Theme>>) -> Self {
pub fn style(mut self, style: impl Into<Style<'a, Theme>>) -> Self {
self.style = style.into();
self
}
Expand Down Expand Up @@ -529,7 +529,7 @@ where

let on_select = &self.on_select;

let mut menu = Menu::with_style(
let mut menu = Menu::new(
&mut state.menu,
self.options.borrow(),
&mut state.hovered_option,
Expand All @@ -539,7 +539,7 @@ where
(on_select)(option)
},
None,
self.style.menu,
&self.style.menu,
)
.width(bounds.width)
.padding(self.padding)
Expand Down Expand Up @@ -676,40 +676,27 @@ pub struct Appearance {
}

/// The styles of the different parts of a [`PickList`].
#[derive(Debug, PartialEq, Eq)]
pub struct Style<Theme> {
#[allow(missing_debug_implementations)]
pub struct Style<'a, Theme> {
/// The style of the [`PickList`] itself.
pub field: fn(&Theme, Status) -> Appearance,
pub field: Box<dyn Fn(&Theme, Status) -> Appearance + 'a>,

/// The style of the [`Menu`] of the pick list.
pub menu: menu::Style<Theme>,
pub menu: menu::Style<'a, Theme>,
}

impl Style<Theme> {
/// The default style of a [`PickList`] with the built-in [`Theme`].
pub const DEFAULT: Self = Self {
field: default,
menu: menu::Style::<Theme>::DEFAULT,
};
}

impl<Theme> Clone for Style<Theme> {
fn clone(&self) -> Self {
*self
}
}

impl<Theme> Copy for Style<Theme> {}

/// The default style of a [`PickList`].
pub trait DefaultStyle: Sized {
/// Returns the default style of a [`PickList`].
fn default_style() -> Style<Self>;
fn default_style() -> Style<'static, Self>;
}

impl DefaultStyle for Theme {
fn default_style() -> Style<Self> {
Style::<Self>::DEFAULT
fn default_style() -> Style<'static, Self> {
Style {
field: Box::new(default),
menu: menu::DefaultStyle::default_style(),
}
}
}

Expand Down

0 comments on commit b721fd9

Please sign in to comment.