me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 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
Download patch file Download diff file Expand all files Collapse all files

35
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,26 +187,27 @@ where
match event {
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state,
}) => {
state: ButtonState::Pressed,
})
| Event::Touch(Touch::Started { .. }) => {
let bounds = layout.bounds();
self.state.is_pressed = bounds.contains(cursor_position);
}
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);
match state {
ButtonState::Pressed => {
self.state.is_pressed =
bounds.contains(cursor_position);
}
ButtonState::Released => {
let is_clicked = self.state.is_pressed
&& bounds.contains(cursor_position);
self.state.is_pressed = false;
self.state.is_pressed = false;
if is_clicked {
messages.push(on_press);
}
}
if is_clicked {
messages.push(on_press);
}
}
}

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`].

30
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 => {
if layout.bounds().contains(cursor_position) {
change();
self.state.is_dragging = true;
}
state: ButtonState::Pressed,
})
| Event::Touch(Touch::Started { .. }) => {
if layout.bounds().contains(cursor_position) {
change();
self.state.is_dragging = true;
}
ButtonState::Released => {
self.state.is_dragging = false;
}
},
Event::Mouse(mouse::Event::CursorMoved { .. }) => {
}
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::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 {