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

Added initial touch events to support iOS

Browse Source
This commit is contained in:
Sebastian Imlay 2019-11-11 20:29:58 -08:00
parent 9da6ce474c
commit e19a07d400
13 changed files with 165 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
native/src/event.rs
View File

@ -1,5 +1,5 @@
use crate::{
input::{keyboard, mouse},
input::{keyboard, mouse, touch},
window,
};
@ -19,4 +19,7 @@ pub enum Event {
/// A window event
Window(window::Event),
/// A touch event
Touch(touch::Touch),
}

1
native/src/input.rs
View File

@ -1,6 +1,7 @@
//! Map your system events into input events that the runtime can understand.
pub mod keyboard;
pub mod mouse;
pub mod touch;
mod button_state;

39
native/src/input/touch.rs Normal file
View File

@ -0,0 +1,39 @@
//! Build touch events.
/// The touch of a mobile device.
#[derive(Debug, Clone, Copy, PartialEq)]
pub enum Touch {
/// The touch cursor was started
Started {
/// The X coordinate of the touch position
x: f32,
/// The Y coordinate of the touch position
y: f32,
},
/// The touch cursor was ended
Ended {
/// The X coordinate of the touch position
x: f32,
/// The Y coordinate of the touch position
y: f32,
},
/// The touch was moved.
Moved {
/// The X coordinate of the touch position
x: f32,
/// The Y coordinate of the touch position
y: f32,
},
/// Some canceled button.
Cancelled {
/// The X coordinate of the touch position
x: f32,
/// The Y coordinate of the touch position
y: f32,
},
}

12
native/src/user_interface.rs
View File

@ -1,5 +1,6 @@
use crate::{
input::mouse, layout, Clipboard, Element, Event, Layout, Point, Size,
input::{mouse, touch},
layout, Clipboard, Element, Event, Layout, Point, Size,
};
use std::hash::Hasher;
@ -181,9 +182,16 @@ where
let mut messages = Vec::new();
for event in events {
if let Event::Mouse(mouse::Event::CursorMoved { x, y }) = event {
match event {
Event::Mouse(mouse::Event::CursorMoved { x, y })
| Event::Touch(touch::Touch::Started { x, y })
| Event::Touch(touch::Touch::Ended { x, y })
| Event::Touch(touch::Touch::Moved { x, y })
| Event::Touch(touch::Touch::Cancelled { x, y }) => {
self.cursor_position = Point::new(x, y);
}
_ => {}
}
self.root.widget.on_event(
event,

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

@ -5,7 +5,7 @@
//! [`Button`]: struct.Button.html
//! [`State`]: struct.State.html
use crate::{
input::{mouse, ButtonState},
input::{mouse, touch::Touch, ButtonState},
layout, Clipboard, Element, Event, Hasher, Layout, Length, Point,
Rectangle, Widget,
};
@ -187,17 +187,20 @@ where
match event {
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state,
}) => {
if let Some(on_press) = self.on_press.clone() {
state: ButtonState::Pressed,
})
| Event::Touch(Touch::Started { .. }) => {
let bounds = layout.bounds();
match state {
ButtonState::Pressed => {
self.state.is_pressed =
bounds.contains(cursor_position);
self.state.is_pressed = bounds.contains(cursor_position);
}
ButtonState::Released => {
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Released,
})
| Event::Touch(Touch::Ended { .. }) => {
if let Some(on_press) = self.on_press.clone() {
let bounds = layout.bounds();
let is_clicked = self.state.is_pressed
&& bounds.contains(cursor_position);
@ -208,8 +211,6 @@ where
}
}
}
}
}
_ => {}
}
}

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

@ -2,7 +2,7 @@
use std::hash::Hash;
use crate::{
input::{mouse, ButtonState},
input::{mouse, touch::Touch, ButtonState},
layout, row, text, Align, Clipboard, Element, Event, Font, Hasher,
HorizontalAlignment, Layout, Length, Point, Rectangle, Row, Text,
VerticalAlignment, Widget,
@ -155,7 +155,8 @@ where
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Pressed,
}) => {
})
| Event::Touch(Touch::Started { .. }) => {
let mouse_over = layout.bounds().contains(cursor_position);
if mouse_over {

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

@ -1,6 +1,6 @@
//! Create choices using radio buttons.
use crate::{
input::{mouse, ButtonState},
input::{mouse, touch, ButtonState},
layout, row, text, Align, Clipboard, Element, Event, Font, Hasher,
HorizontalAlignment, Layout, Length, Point, Rectangle, Row, Text,
VerticalAlignment, Widget,
@ -121,7 +121,8 @@ where
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Pressed,
}) => {
})
| Event::Touch(touch::Touch::Started { .. }) => {
if layout.bounds().contains(cursor_position) {
messages.push(self.on_click.clone());
}

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

@ -1,7 +1,7 @@
//! Navigate an endless amount of content with a scrollbar.
use crate::{
column,
input::{mouse, ButtonState},
input::{mouse, touch, ButtonState},
layout, Align, Clipboard, Column, Element, Event, Hasher, Layout, Length,
Point, Rectangle, Size, Widget,
};
@ -175,6 +175,22 @@ where
}
}
}
Event::Touch(touch::Touch::Started { .. }) => {
self.state.scroll_box_touched_at = Some(cursor_position);
}
Event::Touch(touch::Touch::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);
self.state.scroll_box_touched_at =
Some(cursor_position);
}
}
Event::Touch(touch::Touch::Ended { .. }) => {
self.state.scroll_box_touched_at = None;
}
_ => {}
}
}
@ -191,10 +207,23 @@ where
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Released,
}) => {
})
| Event::Touch(touch::Touch::Ended { .. }) => {
self.state.scroller_grabbed_at = None;
}
Event::Mouse(mouse::Event::CursorMoved { .. }) => {
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Pressed,
})
| Event::Touch(touch::Touch::Started { .. }) => {
self.state.scroll_to(
cursor_position.y / (bounds.y + bounds.height),
bounds,
content_bounds,
);
}
Event::Mouse(mouse::Event::CursorMoved { .. })
| Event::Touch(touch::Touch::Moved { .. }) => {
if let (Some(scrollbar), Some(scroller_grabbed_at)) =
(scrollbar, self.state.scroller_grabbed_at)
{
@ -215,7 +244,8 @@ where
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Pressed,
}) => {
})
| Event::Touch(touch::Touch::Started { .. }) => {
if let Some(scrollbar) = scrollbar {
if let Some(scroller_grabbed_at) =
scrollbar.grab_scroller(cursor_position)
@ -326,6 +356,7 @@ where
#[derive(Debug, Clone, Copy, Default)]
pub struct State {
scroller_grabbed_at: Option<f32>,
scroll_box_touched_at: Option<Point>,
offset: f32,
}
@ -391,6 +422,11 @@ impl State {
pub fn is_scroller_grabbed(&self) -> bool {
self.scroller_grabbed_at.is_some()
}
/// Returns whether the scroll box is currently touched or not.
pub fn is_scroll_box_touched(&self) -> bool {
self.scroll_box_touched_at.is_some()
}
}
/// The scrollbar of a [`Scrollable`].

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

@ -5,7 +5,7 @@
//! [`Slider`]: struct.Slider.html
//! [`State`]: struct.State.html
use crate::{
input::{mouse, ButtonState},
input::{mouse, touch::Touch, ButtonState},
layout, Clipboard, Element, Event, Hasher, Layout, Length, Point,
Rectangle, Size, Widget,
};
@ -166,19 +166,23 @@ where
match event {
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state,
}) => match state {
ButtonState::Pressed => {
state: ButtonState::Pressed,
})
| Event::Touch(Touch::Started { .. }) => {
if layout.bounds().contains(cursor_position) {
change();
self.state.is_dragging = true;
}
}
ButtonState::Released => {
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Released,
})
| Event::Touch(Touch::Ended { .. }) => {
self.state.is_dragging = false;
}
},
Event::Mouse(mouse::Event::CursorMoved { .. }) => {
Event::Mouse(mouse::Event::CursorMoved { .. })
| Event::Touch(Touch::Moved { .. }) => {
if self.state.is_dragging {
change();
}

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

@ -5,7 +5,7 @@
//! [`TextInput`]: struct.TextInput.html
//! [`State`]: struct.State.html
use crate::{
input::{keyboard, mouse, ButtonState},
input::{keyboard, mouse, touch, ButtonState},
layout, Clipboard, Element, Event, Font, Hasher, Layout, Length, Point,
Rectangle, Size, Widget,
};
@ -202,7 +202,8 @@ where
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Pressed,
}) => {
})
| Event::Touch(touch::Touch::Started { .. }) => {
let is_clicked = layout.bounds().contains(cursor_position);
if is_clicked {

2
wgpu/Cargo.toml
View File

@ -19,7 +19,7 @@ wgpu_glyph = "0.7"
glyph_brush = "0.6"
raw-window-handle = "0.3"
glam = "0.8"
font-kit = "0.4"
font-kit = "0.5.0"
log = "0.4"
guillotiere = "0.4"

1
winit/src/application.rs
View File

@ -310,7 +310,6 @@ pub trait Application: Sized {
physical_size.width,
physical_size.height,
);
resized = false;
}

26
winit/src/conversion.rs
View File

@ -5,7 +5,7 @@
use crate::{
input::{
keyboard::{self, KeyCode, ModifiersState},
mouse, ButtonState,
mouse, touch, ButtonState,
},
window, Event, Mode, MouseCursor,
};
@ -84,6 +84,9 @@ pub fn window_event(
WindowEvent::HoveredFileCancelled => {
Some(Event::Window(window::Event::FilesHoveredLeft))
}
WindowEvent::Touch(touch) => {
Some(Event::Touch(touch_event(touch)))
}
_ => None,
}
}
@ -342,3 +345,24 @@ pub(crate) fn is_private_use_character(c: char) -> bool {
_ => false,
}
}
pub(crate) fn touch_event(touch: winit::event::Touch) -> touch::Touch {
let location = touch.location;
match touch.phase {
winit::event::TouchPhase::Started => touch::Touch::Started {
x: location.x as f32,
y: location.y as f32,
},
winit::event::TouchPhase::Ended => touch::Touch::Ended {
x: location.x as f32,
y: location.y as f32,
},
winit::event::TouchPhase::Moved => touch::Touch::Moved {
x: location.x as f32,
y: location.y as f32,
},
winit::event::TouchPhase::Cancelled => touch::Touch::Cancelled {
x: location.x as f32,
y: location.y as f32,
},
}
}