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

Make overlay::Menu publish messages on selection

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2023-06-14 11:25:05 +02:00
parent b0205e03d8
commit 87db76a11f
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
2 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

40
widget/src/overlay/menu.rs
View file

@ -19,7 +19,7 @@ pub use iced_style::menu::{Appearance, StyleSheet};
/// A list of selectable options. /// A list of selectable options.
#[allow(missing_debug_implementations)] #[allow(missing_debug_implementations)]
pub struct Menu<'a, T, Renderer = crate::Renderer> pub struct Menu<'a, T, Message, Renderer = crate::Renderer>
where where
Renderer: text::Renderer, Renderer: text::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet,
@ -27,7 +27,7 @@ where
state: &'a mut State, state: &'a mut State,
options: &'a [T], options: &'a [T],
hovered_option: &'a mut Option<usize>, hovered_option: &'a mut Option<usize>,
last_selection: &'a mut Option<T>, on_selected: Box<dyn FnMut(T) -> Message + 'a>,
width: f32, width: f32,
padding: Padding, padding: Padding,
text_size: Option<f32>, text_size: Option<f32>,
@ -37,9 +37,10 @@ where
style: <Renderer::Theme as StyleSheet>::Style, style: <Renderer::Theme as StyleSheet>::Style,
} }
impl<'a, T, Renderer> Menu<'a, T, Renderer> impl<'a, T, Message, Renderer> Menu<'a, T, Message, Renderer>
where where
T: ToString + Clone, T: ToString + Clone,
Message: 'a,
Renderer: text::Renderer + 'a, Renderer: text::Renderer + 'a,
Renderer::Theme: Renderer::Theme:
StyleSheet + container::StyleSheet + scrollable::StyleSheet, StyleSheet + container::StyleSheet + scrollable::StyleSheet,
@ -50,13 +51,13 @@ where
state: &'a mut State, state: &'a mut State,
options: &'a [T], options: &'a [T],
hovered_option: &'a mut Option<usize>, hovered_option: &'a mut Option<usize>,
last_selection: &'a mut Option<T>, on_selected: impl FnMut(T) -> Message + 'a,
) -> Self { ) -> Self {
Menu { Menu {
state, state,
options, options,
hovered_option, hovered_option,
last_selection, on_selected: Box::new(on_selected),
width: 0.0, width: 0.0,
padding: Padding::ZERO, padding: Padding::ZERO,
text_size: None, text_size: None,
@ -121,7 +122,7 @@ where
/// The `target_height` will be used to display the menu either on top /// The `target_height` will be used to display the menu either on top
/// of the target or under it, depending on the screen position and the /// of the target or under it, depending on the screen position and the
/// dimensions of the [`Menu`]. /// dimensions of the [`Menu`].
pub fn overlay<Message: 'a>( pub fn overlay(
self, self,
position: Point, position: Point,
target_height: f32, target_height: f32,
@ -174,7 +175,10 @@ where
Renderer::Theme: Renderer::Theme:
StyleSheet + container::StyleSheet + scrollable::StyleSheet, StyleSheet + container::StyleSheet + scrollable::StyleSheet,
{ {
pub fn new<T>(menu: Menu<'a, T, Renderer>, target_height: f32) -> Self pub fn new<T>(
menu: Menu<'a, T, Message, Renderer>,
target_height: f32,
) -> Self
where where
T: Clone + ToString, T: Clone + ToString,
{ {
@ -182,7 +186,7 @@ where
state, state,
options, options,
hovered_option, hovered_option,
last_selection, on_selected,
width, width,
padding, padding,
font, font,
@ -195,7 +199,7 @@ where
let container = Container::new(Scrollable::new(List { let container = Container::new(Scrollable::new(List {
options, options,
hovered_option, hovered_option,
last_selection, on_selected,
font, font,
text_size, text_size,
text_line_height, text_line_height,
@ -306,14 +310,14 @@ where
} }
} }
struct List<'a, T, Renderer> struct List<'a, T, Message, Renderer>
where where
Renderer: text::Renderer, Renderer: text::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet,
{ {
options: &'a [T], options: &'a [T],
hovered_option: &'a mut Option<usize>, hovered_option: &'a mut Option<usize>,
last_selection: &'a mut Option<T>, on_selected: Box<dyn FnMut(T) -> Message + 'a>,
padding: Padding, padding: Padding,
text_size: Option<f32>, text_size: Option<f32>,
text_line_height: text::LineHeight, text_line_height: text::LineHeight,
@ -323,7 +327,7 @@ where
} }
impl<'a, T, Message, Renderer> Widget<Message, Renderer> impl<'a, T, Message, Renderer> Widget<Message, Renderer>
for List<'a, T, Renderer> for List<'a, T, Message, Renderer>
where where
T: Clone + ToString, T: Clone + ToString,
Renderer: text::Renderer, Renderer: text::Renderer,
@ -372,14 +376,15 @@ where
cursor: mouse::Cursor, cursor: mouse::Cursor,
renderer: &Renderer, renderer: &Renderer,
_clipboard: &mut dyn Clipboard, _clipboard: &mut dyn Clipboard,
_shell: &mut Shell<'_, Message>, shell: &mut Shell<'_, Message>,
) -> event::Status { ) -> event::Status {
match event { match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => { Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) => {
if cursor.is_over(layout.bounds()) { if cursor.is_over(layout.bounds()) {
if let Some(index) = *self.hovered_option { if let Some(index) = *self.hovered_option {
if let Some(option) = self.options.get(index) { if let Some(option) = self.options.get(index) {
*self.last_selection = Some(option.clone()); shell.publish((self.on_selected)(option.clone()));
return event::Status::Captured;
} }
} }
} }
@ -417,7 +422,8 @@ where
if let Some(index) = *self.hovered_option { if let Some(index) = *self.hovered_option {
if let Some(option) = self.options.get(index) { if let Some(option) = self.options.get(index) {
*self.last_selection = Some(option.clone()); shell.publish((self.on_selected)(option.clone()));
return event::Status::Captured;
} }
} }
} }
@ -521,7 +527,7 @@ where
} }
} }
impl<'a, T, Message, Renderer> From<List<'a, T, Renderer>> impl<'a, T, Message, Renderer> From<List<'a, T, Message, Renderer>>
for Element<'a, Message, Renderer> for Element<'a, Message, Renderer>
where where
T: ToString + Clone, T: ToString + Clone,
@ -529,7 +535,7 @@ where
Renderer: 'a + text::Renderer, Renderer: 'a + text::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet,
{ {
fn from(list: List<'a, T, Renderer>) -> Self { fn from(list: List<'a, T, Message, Renderer>) -> Self {
Element::new(list) Element::new(list)
} }
} }

44
widget/src/pick_list.rs
View file

@ -157,11 +157,11 @@ where
From<<Renderer::Theme as StyleSheet>::Style>, From<<Renderer::Theme as StyleSheet>::Style>,
{ {
fn tag(&self) -> tree::Tag { fn tag(&self) -> tree::Tag {
tree::Tag::of::<State<T>>() tree::Tag::of::<State>()
} }
fn state(&self) -> tree::State { fn state(&self) -> tree::State {
tree::State::new(State::<T>::new()) tree::State::new(State::new())
} }
fn width(&self) -> Length { fn width(&self) -> Length {
@ -209,7 +209,7 @@ where
self.on_selected.as_ref(), self.on_selected.as_ref(),
self.selected.as_ref(), self.selected.as_ref(),
&self.options, &self.options,
|| tree.state.downcast_mut::<State<T>>(), || tree.state.downcast_mut::<State>(),
) )
} }
@ -249,7 +249,7 @@ where
self.selected.as_ref(), self.selected.as_ref(),
&self.handle, &self.handle,
&self.style, &self.style,
|| tree.state.downcast_ref::<State<T>>(), || tree.state.downcast_ref::<State>(),
) )
} }
@ -259,7 +259,7 @@ where
layout: Layout<'_>, layout: Layout<'_>,
renderer: &Renderer, renderer: &Renderer,
) -> Option<overlay::Element<'b, Message, Renderer>> { ) -> Option<overlay::Element<'b, Message, Renderer>> {
let state = tree.state.downcast_mut::<State<T>>(); let state = tree.state.downcast_mut::<State>();
overlay( overlay(
layout, layout,
@ -269,6 +269,7 @@ where
self.text_shaping, self.text_shaping,
self.font.unwrap_or_else(|| renderer.default_font()), self.font.unwrap_or_else(|| renderer.default_font()),
&self.options, &self.options,
&self.on_selected,
self.style.clone(), self.style.clone(),
) )
} }
@ -295,15 +296,14 @@ where
/// The local state of a [`PickList`]. /// The local state of a [`PickList`].
#[derive(Debug)] #[derive(Debug)]
pub struct State<T> { pub struct State {
menu: menu::State, menu: menu::State,
keyboard_modifiers: keyboard::Modifiers, keyboard_modifiers: keyboard::Modifiers,
is_open: bool, is_open: bool,
hovered_option: Option<usize>, hovered_option: Option<usize>,
last_selection: Option<T>,
} }
impl<T> State<T> { impl State {
/// Creates a new [`State`] for a [`PickList`]. /// Creates a new [`State`] for a [`PickList`].
pub fn new() -> Self { pub fn new() -> Self {
Self { Self {
@ -311,12 +311,11 @@ impl<T> State<T> {
keyboard_modifiers: keyboard::Modifiers::default(), keyboard_modifiers: keyboard::Modifiers::default(),
is_open: bool::default(), is_open: bool::default(),
hovered_option: Option::default(), hovered_option: Option::default(),
last_selection: Option::default(),
} }
} }
} }
impl<T> Default for State<T> { impl Default for State {
fn default() -> Self { fn default() -> Self {
Self::new() Self::new()
} }
@ -436,7 +435,7 @@ pub fn update<'a, T, Message>(
on_selected: &dyn Fn(T) -> Message, on_selected: &dyn Fn(T) -> Message,
selected: Option<&T>, selected: Option<&T>,
options: &[T], options: &[T],
state: impl FnOnce() -> &'a mut State<T>, state: impl FnOnce() -> &'a mut State,
) -> event::Status ) -> event::Status
where where
T: PartialEq + Clone + 'a, T: PartialEq + Clone + 'a,
@ -446,7 +445,7 @@ where
| Event::Touch(touch::Event::FingerPressed { .. }) => { | Event::Touch(touch::Event::FingerPressed { .. }) => {
let state = state(); let state = state();
let event_status = if state.is_open { if state.is_open {
// Event wasn't processed by overlay, so cursor was clicked either outside it's // Event wasn't processed by overlay, so cursor was clicked either outside it's
// bounds or on the drop-down, either way we close the overlay. // bounds or on the drop-down, either way we close the overlay.
state.is_open = false; state.is_open = false;
@ -460,16 +459,6 @@ where
event::Status::Captured event::Status::Captured
} else { } else {
event::Status::Ignored event::Status::Ignored
};
if let Some(last_selection) = state.last_selection.take() {
shell.publish((on_selected)(last_selection));
state.is_open = false;
event::Status::Captured
} else {
event_status
} }
} }
Event::Mouse(mouse::Event::WheelScrolled { Event::Mouse(mouse::Event::WheelScrolled {
@ -544,12 +533,13 @@ pub fn mouse_interaction(
/// Returns the current overlay of a [`PickList`]. /// Returns the current overlay of a [`PickList`].
pub fn overlay<'a, T, Message, Renderer>( pub fn overlay<'a, T, Message, Renderer>(
layout: Layout<'_>, layout: Layout<'_>,
state: &'a mut State<T>, state: &'a mut State,
padding: Padding, padding: Padding,
text_size: Option<f32>, text_size: Option<f32>,
text_shaping: text::Shaping, text_shaping: text::Shaping,
font: Renderer::Font, font: Renderer::Font,
options: &'a [T], options: &'a [T],
on_selected: &'a dyn Fn(T) -> Message,
style: <Renderer::Theme as StyleSheet>::Style, style: <Renderer::Theme as StyleSheet>::Style,
) -> Option<overlay::Element<'a, Message, Renderer>> ) -> Option<overlay::Element<'a, Message, Renderer>>
where where
@ -570,7 +560,11 @@ where
&mut state.menu, &mut state.menu,
options, options,
&mut state.hovered_option, &mut state.hovered_option,
&mut state.last_selection, |option| {
state.is_open = false;
(on_selected)(option)
},
) )
.width(bounds.width) .width(bounds.width)
.padding(padding) .padding(padding)
@ -603,7 +597,7 @@ pub fn draw<'a, T, Renderer>(
selected: Option<&T>, selected: Option<&T>,
handle: &Handle<Renderer::Font>, handle: &Handle<Renderer::Font>,
style: &<Renderer::Theme as StyleSheet>::Style, style: &<Renderer::Theme as StyleSheet>::Style,
state: impl FnOnce() -> &'a State<T>, state: impl FnOnce() -> &'a State,
) where ) where
Renderer: text::Renderer, Renderer: text::Renderer,
Renderer::Theme: StyleSheet, Renderer::Theme: StyleSheet,