Add on_scroll handler to mouse_area widget

This commit is contained in:
Siliwolf 2024-05-25 18:13:34 -03:00 committed by Héctor Ramón Jiménez
parent ae58a40398
commit bf4796bbeb
No known key found for this signature in database
GPG key ID: 7CC46565708259A7

View file

@ -1,7 +1,5 @@
//! A container for capturing mouse events.
use iced_renderer::core::Point;
use crate::core::event::{self, Event};
use crate::core::layout;
use crate::core::mouse;
@ -10,7 +8,8 @@ use crate::core::renderer;
use crate::core::touch;
use crate::core::widget::{tree, Operation, Tree};
use crate::core::{
Clipboard, Element, Layout, Length, Rectangle, Shell, Size, Vector, Widget,
Clipboard, Element, Layout, Length, Point, Rectangle, Shell, Size, Vector,
Widget,
};
/// Emit messages on mouse events.
@ -28,6 +27,7 @@ pub struct MouseArea<
on_right_release: Option<Message>,
on_middle_press: Option<Message>,
on_middle_release: Option<Message>,
on_scroll: Option<Box<dyn Fn(mouse::ScrollDelta) -> Message + 'a>>,
on_enter: Option<Message>,
on_move: Option<Box<dyn Fn(Point) -> Message>>,
on_exit: Option<Message>,
@ -77,6 +77,16 @@ impl<'a, Message, Theme, Renderer> MouseArea<'a, Message, Theme, Renderer> {
self
}
/// The message to emit when scroll wheel is used
#[must_use]
pub fn on_scroll<F>(mut self, on_scroll: F) -> Self
where
F: Fn(mouse::ScrollDelta) -> Message + 'static,
{
self.on_scroll = Some(Box::new(on_scroll));
self
}
/// The message to emit when the mouse enters the area.
#[must_use]
pub fn on_enter(mut self, message: Message) -> Self {
@ -128,6 +138,7 @@ impl<'a, Message, Theme, Renderer> MouseArea<'a, Message, Theme, Renderer> {
on_right_release: None,
on_middle_press: None,
on_middle_release: None,
on_scroll: None,
on_enter: None,
on_move: None,
on_exit: None,
@ -397,5 +408,13 @@ fn update<Message: Clone, Theme, Renderer>(
}
}
if let Some(on_scroll) = widget.on_scroll.as_ref() {
if let Event::Mouse(mouse::Event::WheelScrolled { delta }) = event {
shell.publish(on_scroll(delta));
return event::Status::Captured;
}
}
event::Status::Ignored
}