reivilibre/iced-mobile
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Turn Touch into a touch::Event enum

Browse Source
This commit is contained in:
Héctor Ramón Jiménez 2020-12-15 06:38:46 +01:00
parent 09110a93b0
commit 3bdf931925
9 changed files with 89 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/src/event.rs
View File

@ -22,7 +22,7 @@ pub enum Event {
Window(window::Event),
/// A touch event
Touch(touch::Touch),
Touch(touch::Event),
}
/// The status of an [`Event`] after being processed.

34
native/src/touch.rs
View File

@ -3,33 +3,21 @@ use crate::Point;
/// A touch interaction.
#[derive(Debug, Clone, Copy, PartialEq)]
pub struct Touch {
/// The finger of the touch.
pub finger: Finger,
#[allow(missing_docs)]
pub enum Event {
/// A touch interaction was started.
FingerPressed { id: Finger, position: Point },
/// The position of the touch.
pub position: Point,
/// An on-going touch interaction was moved.
FingerMoved { id: Finger, position: Point },
/// The state of the touch.
pub phase: Phase,
/// A touch interaction was ended.
FingerLifted { id: Finger, position: Point },
/// A touch interaction was canceled.
FingerLost { id: Finger, position: Point },
}
/// A unique identifier representing a finger on a touch interaction.
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
pub struct Finger(pub u64);
/// The state of a touch interaction.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub enum Phase {
/// A touch interaction was started.
Started,
/// An on-going touch interaction was moved.
Moved,
/// A touch interaction was ended.
Ended,
/// A touch interaction was canceled.
Canceled,
}

17
native/src/widget/button.rs
View File

@ -4,7 +4,7 @@
use crate::event::{self, Event};
use crate::layout;
use crate::mouse;
use crate::touch::{self, Touch};
use crate::touch;
use crate::{
Clipboard, Element, Hasher, Layout, Length, Point, Rectangle, Widget,
};
@ -166,10 +166,7 @@ where
) -> event::Status {
match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
| Event::Touch(touch::Event::FingerPressed { .. }) => {
if self.on_press.is_some() {
let bounds = layout.bounds();
@ -181,10 +178,7 @@ where
}
}
Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
| Event::Touch(Touch {
phase: touch::Phase::Ended,
..
}) => {
| Event::Touch(touch::Event::FingerLifted { .. }) => {
if let Some(on_press) = self.on_press.clone() {
let bounds = layout.bounds();
@ -199,10 +193,7 @@ where
}
}
}
Event::Touch(Touch {
phase: touch::Phase::Canceled,
..
}) => {
Event::Touch(touch::Event::FingerLost { .. }) => {
self.state.is_pressed = false;
}
_ => {}

7
native/src/widget/checkbox.rs
View File

@ -6,7 +6,7 @@ use crate::layout;
use crate::mouse;
use crate::row;
use crate::text;
use crate::touch::{self, Touch};
use crate::touch;
use crate::{
Align, Clipboard, Element, Hasher, HorizontalAlignment, Layout, Length,
Point, Rectangle, Row, Text, VerticalAlignment, Widget,
@ -156,10 +156,7 @@ where
) -> event::Status {
match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
| Event::Touch(touch::Event::FingerPressed { .. }) => {
let mouse_over = layout.bounds().contains(cursor_position);
if mouse_over {

7
native/src/widget/radio.rs
View File

@ -4,7 +4,7 @@ use crate::layout;
use crate::mouse;
use crate::row;
use crate::text;
use crate::touch::{self, Touch};
use crate::touch;
use crate::{
Align, Clipboard, Element, Hasher, HorizontalAlignment, Layout, Length,
Point, Rectangle, Row, Text, VerticalAlignment, Widget,
@ -162,10 +162,7 @@ where
) -> event::Status {
match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
| Event::Touch(touch::Event::FingerPressed { .. }) => {
if layout.bounds().contains(cursor_position) {
messages.push(self.on_click.clone());

65
native/src/widget/scrollable.rs
View File

@ -4,7 +4,7 @@ use crate::event::{self, Event};
use crate::layout;
use crate::mouse;
use crate::overlay;
use crate::touch::{self, Touch};
use crate::touch;
use crate::{
Align, Clipboard, Column, Element, Hasher, Layout, Length, Point,
Rectangle, Size, Vector, Widget,
@ -230,26 +230,37 @@ where
return event::Status::Captured;
}
Event::Touch(Touch { phase, .. }) => match phase {
touch::Phase::Started => {
self.state.scroll_box_touched_at =
Some(cursor_position);
}
touch::Phase::Moved => {
if let Some(scroll_box_touched_at) =
self.state.scroll_box_touched_at
{
let delta =
cursor_position.y - scroll_box_touched_at.y;
self.state.scroll(delta, bounds, content_bounds);
Event::Touch(event) => {
match event {
touch::Event::FingerPressed { .. } => {
self.state.scroll_box_touched_at =
Some(cursor_position);
}
touch::Event::FingerMoved { .. } => {
if let Some(scroll_box_touched_at) =
self.state.scroll_box_touched_at
{
let delta =
cursor_position.y - scroll_box_touched_at.y;
self.state.scroll(
delta,
bounds,
content_bounds,
);
self.state.scroll_box_touched_at =
Some(cursor_position);
}
}
touch::Event::FingerLifted { .. }
| touch::Event::FingerLost { .. } => {
self.state.scroll_box_touched_at = None;
}
}
touch::Phase::Ended | touch::Phase::Canceled => {
self.state.scroll_box_touched_at = None;
}
},
return event::Status::Captured;
}
_ => {}
}
}
@ -259,23 +270,14 @@ where
Event::Mouse(mouse::Event::ButtonReleased(
mouse::Button::Left,
))
| Event::Touch(Touch {
phase: touch::Phase::Ended,
..
})
| Event::Touch(Touch {
phase: touch::Phase::Canceled,
..
}) => {
| Event::Touch(touch::Event::FingerLifted { .. })
| Event::Touch(touch::Event::FingerLost { .. }) => {
self.state.scroller_grabbed_at = None;
return event::Status::Captured;
}
Event::Mouse(mouse::Event::CursorMoved { .. })
| Event::Touch(Touch {
phase: touch::Phase::Moved,
..
}) => {
| Event::Touch(touch::Event::FingerMoved { .. }) => {
if let (Some(scrollbar), Some(scroller_grabbed_at)) =
(scrollbar, self.state.scroller_grabbed_at)
{
@ -298,10 +300,7 @@ where
Event::Mouse(mouse::Event::ButtonPressed(
mouse::Button::Left,
))
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
| Event::Touch(touch::Event::FingerPressed { .. }) => {
if let Some(scrollbar) = scrollbar {
if let Some(scroller_grabbed_at) =
scrollbar.grab_scroller(cursor_position)

18
native/src/widget/slider.rs
View File

@ -4,7 +4,7 @@
use crate::event::{self, Event};
use crate::layout;
use crate::mouse;
use crate::touch::{self, Touch};
use crate::touch;
use crate::{
Clipboard, Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget,
};
@ -209,10 +209,7 @@ where
match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
| Event::Touch(touch::Event::FingerPressed { .. }) => {
if layout.bounds().contains(cursor_position) {
change();
self.state.is_dragging = true;
@ -221,10 +218,8 @@ where
}
}
Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
| Event::Touch(Touch {
phase: touch::Phase::Ended,
..
}) => {
| Event::Touch(touch::Event::FingerLifted { .. })
| Event::Touch(touch::Event::FingerLost { .. }) => {
if self.state.is_dragging {
if let Some(on_release) = self.on_release.clone() {
messages.push(on_release);
@ -235,10 +230,7 @@ where
}
}
Event::Mouse(mouse::Event::CursorMoved { .. })
| Event::Touch(Touch {
phase: touch::Phase::Moved,
..
}) => {
| Event::Touch(touch::Event::FingerMoved { .. }) => {
if self.state.is_dragging {
change();

7
native/src/widget/text_input.rs
View File

@ -16,7 +16,7 @@ use crate::keyboard;
use crate::layout;
use crate::mouse::{self, click};
use crate::text;
use crate::touch::{self, Touch};
use crate::touch;
use crate::{
Clipboard, Element, Hasher, Layout, Length, Point, Rectangle, Size, Widget,
};
@ -249,10 +249,7 @@ where
) -> event::Status {
match event {
Event::Mouse(mouse::Event::ButtonPressed(mouse::Button::Left))
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
| Event::Touch(touch::Event::FingerPressed { .. }) => {
let is_clicked = layout.bounds().contains(cursor_position);
self.state.is_focused = is_clicked;

50
winit/src/conversion.rs
View File

@ -2,12 +2,11 @@
//!
//! [`winit`]: https://github.com/rust-windowing/winit
//! [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
use crate::{
keyboard::{self, KeyCode, Modifiers},
mouse,
touch::{self, Touch},
window, Event, Mode, Point,
};
use crate::keyboard;
use crate::mouse;
use crate::touch;
use crate::window;
use crate::{Event, Mode, Point};
/// Converts a winit window event into an iced event.
pub fn window_event(
@ -183,8 +182,10 @@ pub fn mouse_button(mouse_button: winit::event::MouseButton) -> mouse::Button {
///
/// [`winit`]: https://github.com/rust-windowing/winit
/// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
pub fn modifiers(modifiers: winit::event::ModifiersState) -> Modifiers {
Modifiers {
pub fn modifiers(
modifiers: winit::event::ModifiersState,
) -> keyboard::Modifiers {
keyboard::Modifiers {
shift: modifiers.shift(),
control: modifiers.ctrl(),
alt: modifiers.alt(),
@ -206,18 +207,23 @@ pub fn cursor_position(
///
/// [`winit`]: https://github.com/rust-windowing/winit
/// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
pub fn touch_event(touch: winit::event::Touch) -> Touch {
let phase = match touch.phase {
winit::event::TouchPhase::Started => touch::Phase::Started,
winit::event::TouchPhase::Moved => touch::Phase::Moved,
winit::event::TouchPhase::Ended => touch::Phase::Ended,
winit::event::TouchPhase::Cancelled => touch::Phase::Canceled,
};
pub fn touch_event(touch: winit::event::Touch) -> touch::Event {
let id = touch::Finger(touch.id);
let position = Point::new(touch.location.x as f32, touch.location.y as f32);
Touch {
finger: touch::Finger(touch.id),
position: Point::new(touch.location.x as f32, touch.location.y as f32),
phase,
match touch.phase {
winit::event::TouchPhase::Started => {
touch::Event::FingerPressed { id, position }
}
winit::event::TouchPhase::Moved => {
touch::Event::FingerMoved { id, position }
}
winit::event::TouchPhase::Ended => {
touch::Event::FingerLifted { id, position }
}
winit::event::TouchPhase::Cancelled => {
touch::Event::FingerLost { id, position }
}
}
}
@ -225,7 +231,11 @@ pub fn touch_event(touch: winit::event::Touch) -> Touch {
///
/// [`winit`]: https://github.com/rust-windowing/winit
/// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native
pub fn key_code(virtual_keycode: winit::event::VirtualKeyCode) -> KeyCode {
pub fn key_code(
virtual_keycode: winit::event::VirtualKeyCode,
) -> keyboard::KeyCode {
use keyboard::KeyCode;
match virtual_keycode {
winit::event::VirtualKeyCode::Key1 => KeyCode::Key1,
winit::event::VirtualKeyCode::Key2 => KeyCode::Key2,