me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Turn Touch into a struct and add finger id

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2020-03-19 12:17:16 +01:00
parent e19a07d400
commit d3572e1b81
13 changed files with 151 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

24
native/src/widget/button.rs
View file

@ -5,7 +5,7 @@
//! [`Button`]: struct.Button.html
//! [`State`]: struct.State.html
use crate::{
input::{mouse, touch::Touch, ButtonState},
input::{mouse, touch, ButtonState, Touch},
layout, Clipboard, Element, Event, Hasher, Layout, Length, Point,
Rectangle, Widget,
};
@ -189,16 +189,24 @@ where
button: mouse::Button::Left,
state: ButtonState::Pressed,
})
| Event::Touch(Touch::Started { .. }) => {
let bounds = layout.bounds();
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
if self.on_press.is_some() {
let bounds = layout.bounds();
self.state.is_pressed = bounds.contains(cursor_position);
self.state.is_pressed = bounds.contains(cursor_position);
}
}
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Released,
})
| Event::Touch(Touch::Ended { .. }) => {
| Event::Touch(Touch {
phase: touch::Phase::Ended,
..
}) => {
if let Some(on_press) = self.on_press.clone() {
let bounds = layout.bounds();
let is_clicked = self.state.is_pressed
@ -211,6 +219,12 @@ where
}
}
}
Event::Touch(Touch {
phase: touch::Phase::Canceled,
..
}) => {
self.state.is_pressed = false;
}
_ => {}
}
}

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

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

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

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

56
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, touch, ButtonState},
input::{mouse, touch, ButtonState, Touch},
layout, Align, Clipboard, Column, Element, Event, Hasher, Layout, Length,
Point, Rectangle, Size, Widget,
};
@ -175,22 +175,26 @@ 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);
Event::Touch(Touch { phase, .. }) => match phase {
touch::Phase::Started => {
self.state.scroll_box_touched_at =
Some(cursor_position);
}
}
Event::Touch(touch::Touch::Ended { .. }) => {
self.state.scroll_box_touched_at = None;
}
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);
self.state.scroll_box_touched_at =
Some(cursor_position);
}
}
touch::Phase::Ended | touch::Phase::Canceled => {
self.state.scroll_box_touched_at = None;
}
},
_ => {}
}
}
@ -208,14 +212,24 @@ where
button: mouse::Button::Left,
state: ButtonState::Released,
})
| Event::Touch(touch::Touch::Ended { .. }) => {
| Event::Touch(Touch {
phase: touch::Phase::Ended,
..
})
| Event::Touch(Touch {
phase: touch::Phase::Canceled,
..
}) => {
self.state.scroller_grabbed_at = None;
}
Event::Mouse(mouse::Event::Input {
button: mouse::Button::Left,
state: ButtonState::Pressed,
})
| Event::Touch(touch::Touch::Started { .. }) => {
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
self.state.scroll_to(
cursor_position.y / (bounds.y + bounds.height),
bounds,
@ -223,7 +237,10 @@ where
);
}
Event::Mouse(mouse::Event::CursorMoved { .. })
| Event::Touch(touch::Touch::Moved { .. }) => {
| Event::Touch(Touch {
phase: touch::Phase::Moved,
..
}) => {
if let (Some(scrollbar), Some(scroller_grabbed_at)) =
(scrollbar, self.state.scroller_grabbed_at)
{
@ -245,7 +262,10 @@ where
button: mouse::Button::Left,
state: ButtonState::Pressed,
})
| Event::Touch(touch::Touch::Started { .. }) => {
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
if let Some(scrollbar) = scrollbar {
if let Some(scroller_grabbed_at) =
scrollbar.grab_scroller(cursor_position)

17
native/src/widget/slider.rs
View file

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

7
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, touch, ButtonState},
input::{keyboard, mouse, touch, ButtonState, Touch},
layout, Clipboard, Element, Event, Font, Hasher, Layout, Length, Point,
Rectangle, Size, Widget,
};
@ -203,7 +203,10 @@ where
button: mouse::Button::Left,
state: ButtonState::Pressed,
})
| Event::Touch(touch::Touch::Started { .. }) => {
| Event::Touch(Touch {
phase: touch::Phase::Started,
..
}) => {
let is_clicked = layout.bounds().contains(cursor_position);
if is_clicked {