leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(button): on_press_down

Browse source
This commit is contained in:
Ashley Wulber 2024-05-17 20:46:24 -04:00 • committed by Michael Murphy
parent 1ae9dae4cb
commit 2af549f5b1
1 changed files with 24 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/widget/button/widget.rs
View file

@ -48,6 +48,7 @@ pub struct Button<'a, Message> {
label: Option<Vec<iced_accessibility::accesskit::NodeId>>, label: Option<Vec<iced_accessibility::accesskit::NodeId>>,
content: crate::Element<'a, Message>, content: crate::Element<'a, Message>,
on_press: Option<Message>, on_press: Option<Message>,
on_press_down: Option<Message>,
width: Length, width: Length,
height: Length, height: Length,
padding: Padding, padding: Padding,
@ -69,6 +70,7 @@ impl<'a, Message> Button<'a, Message> {
label: None, label: None,
content: content.into(), content: content.into(),
on_press: None, on_press: None,
on_press_down: None,
width: Length::Shrink, width: Length::Shrink,
height: Length::Shrink, height: Length::Shrink,
padding: Padding::new(5.0), padding: Padding::new(5.0),
@ -92,6 +94,7 @@ impl<'a, Message> Button<'a, Message> {
label: None, label: None,
content: content.into(), content: content.into(),
on_press: None, on_press: None,
on_press_down: None,
width: Length::Shrink, width: Length::Shrink,
height: Length::Shrink, height: Length::Shrink,
padding: Padding::new(5.0), padding: Padding::new(5.0),
@ -135,14 +138,22 @@ impl<'a, Message> Button<'a, Message> {
self self
} }
/// Sets the message that will be produced when the [`Button`] is pressed. /// Sets the message that will be produced when the [`Button`] is pressed and released.
/// ///
/// Unless `on_press` is called, the [`Button`] will be disabled. /// Unless `on_press` or `on_press_down` is called, the [`Button`] will be disabled.
pub fn on_press(mut self, on_press: Message) -> Self { pub fn on_press(mut self, on_press: Message) -> Self {
self.on_press = Some(on_press); self.on_press = Some(on_press);
self self
} }
/// Sets the message that will be produced when the [`Button`] is pressed,
///
/// Unless `on_press` or `on_press_down` is called, the [`Button`] will be disabled.
pub fn on_press_down(mut self, on_press: Message) -> Self {
self.on_press_down = Some(on_press);
self
}
/// Sets the message that will be produced when the [`Button`] is pressed, /// Sets the message that will be produced when the [`Button`] is pressed,
/// if `Some`. /// if `Some`.
/// ///
@ -313,6 +324,7 @@ impl<'a, Message: 'a + Clone> Widget<Message, crate::Theme, crate::Renderer>
cursor, cursor,
shell, shell,
&self.on_press, &self.on_press,
&self.on_press_down,
|| tree.state.downcast_mut::<State>(), || tree.state.downcast_mut::<State>(),
) )
} }
@ -333,7 +345,7 @@ impl<'a, Message: 'a + Clone> Widget<Message, crate::Theme, crate::Renderer>
let mut headerbar_alpha = None; let mut headerbar_alpha = None;
let is_enabled = self.on_press.is_some(); let is_enabled = self.on_press.is_some() || self.on_press_down.is_some();
let is_mouse_over = cursor.position().is_some_and(|p| bounds.contains(p)); let is_mouse_over = cursor.position().is_some_and(|p| bounds.contains(p));
let state = tree.state.downcast_ref::<State>(); let state = tree.state.downcast_ref::<State>();
@ -616,12 +628,13 @@ pub fn update<'a, Message: Clone>(
cursor: mouse::Cursor, cursor: mouse::Cursor,
shell: &mut Shell<'_, Message>, shell: &mut Shell<'_, Message>,
on_press: &Option<Message>, on_press: &Option<Message>,
on_press_down: &Option<Message>,
state: impl FnOnce() -> &'a mut State, state: impl FnOnce() -> &'a mut State,
) -> event::Status { ) -> event::Status {
match event { match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left)) Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(touch::Event::FingerPressed { .. }) => { | Event::Touch(touch::Event::FingerPressed { .. }) => {
if on_press.is_some() { if on_press.is_some() || on_press_down.is_some() {
let bounds = layout.bounds(); let bounds = layout.bounds();
if cursor.is_over(bounds) { if cursor.is_over(bounds) {
@ -629,6 +642,10 @@ pub fn update<'a, Message: Clone>(
state.is_pressed = true; state.is_pressed = true;
if let Some(on_press_down) = on_press_down {
shell.publish(on_press_down.clone());
}
return event::Status::Captured; return event::Status::Captured;
} }
} }
@ -649,6 +666,9 @@ pub fn update<'a, Message: Clone>(
return event::Status::Captured; return event::Status::Captured;
} }
} else if on_press_down.is_some() {
let state = state();
state.is_pressed = false;
} }
} }
#[cfg(feature = "a11y")] #[cfg(feature = "a11y")]