Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Move last_touch_point into the TouchState machine

Browse source
This commit is contained in:
Matt Brubeck 2015-11-06 13:59:28 -08:00
parent c54558d5ef
commit 2171683244
1 changed files with 10 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
components/compositing/compositor.rs
View file

@ -185,9 +185,6 @@ pub struct IOCompositor<Window: WindowMethods> {
/// When tracking a touch for gesture detection, the point where it started /// When tracking a touch for gesture detection, the point where it started
first_touch_point: Option<TypedPoint2D<DevicePixel, f32>>, first_touch_point: Option<TypedPoint2D<DevicePixel, f32>>,
/// When tracking a touch for gesture detection, its most recent point
last_touch_point: Option<TypedPoint2D<DevicePixel, f32>>,
/// Pending scroll events. /// Pending scroll events.
pending_scroll_events: Vec<ScrollEvent>, pending_scroll_events: Vec<ScrollEvent>,
@ -220,8 +217,8 @@ enum TouchState {
DefaultPrevented(u32), DefaultPrevented(u32),
/// A single touch point is active and may perform click or pan default actions. /// A single touch point is active and may perform click or pan default actions.
Touching, Touching,
/// A single touch point is active and has started panning. /// A single touch point is active and has started panning. Contains the latest touch location.
Panning, Panning(TypedPoint2D<DevicePixel, f32>),
/// A multi-touch gesture is in progress. Contains the number of active touch points. /// A multi-touch gesture is in progress. Contains the number of active touch points.
MultiTouch(u32), MultiTouch(u32),
} }
@ -353,7 +350,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
composition_request: CompositionRequest::NoCompositingNecessary, composition_request: CompositionRequest::NoCompositingNecessary,
touch_gesture_state: TouchState::Nothing, touch_gesture_state: TouchState::Nothing,
first_touch_point: None, first_touch_point: None,
last_touch_point: None,
pending_scroll_events: Vec::new(), pending_scroll_events: Vec::new(),
composite_target: composite_target, composite_target: composite_target,
shutdown_state: ShutdownState::NotShuttingDown, shutdown_state: ShutdownState::NotShuttingDown,
@ -1235,11 +1231,10 @@ impl<Window: WindowMethods> IOCompositor<Window> {
TouchState::Nothing => { TouchState::Nothing => {
// TODO: Don't wait for script if we know the page has no touch event listeners. // TODO: Don't wait for script if we know the page has no touch event listeners.
self.first_touch_point = Some(point); self.first_touch_point = Some(point);
self.last_touch_point = Some(point);
TouchState::WaitingForScript(1) TouchState::WaitingForScript(1)
} }
TouchState::Touching | TouchState::Touching |
TouchState::Panning => { TouchState::Panning(_) => {
// Was a single-touch sequence; now a multi-touch sequence: // Was a single-touch sequence; now a multi-touch sequence:
TouchState::MultiTouch(2) TouchState::MultiTouch(2)
} }
@ -1276,21 +1271,17 @@ impl<Window: WindowMethods> IOCompositor<Window> {
if px.x.abs() > TOUCH_PAN_MIN_SCREEN_PX || if px.x.abs() > TOUCH_PAN_MIN_SCREEN_PX ||
px.y.abs() > TOUCH_PAN_MIN_SCREEN_PX px.y.abs() > TOUCH_PAN_MIN_SCREEN_PX
{ {
self.touch_gesture_state = TouchState::Panning; self.touch_gesture_state = TouchState::Panning(point);
self.on_scroll_window_event(delta, point.cast().unwrap()); self.on_scroll_window_event(delta, point.cast().unwrap());
} }
} }
None => warn!("first_touch_point not set") None => warn!("first_touch_point not set")
} }
} }
TouchState::Panning => { TouchState::Panning(p0) => {
match self.last_touch_point { let delta = point - p0;
Some(p0) => { self.on_scroll_window_event(delta, point.cast().unwrap());
let delta = point - p0; self.touch_gesture_state = TouchState::Panning(point);
self.on_scroll_window_event(delta, point.cast().unwrap());
}
None => warn!("last_touch_point not set")
}
} }
TouchState::DefaultPrevented(_) => { TouchState::DefaultPrevented(_) => {
// Send the event to script. // Send the event to script.
@ -1303,7 +1294,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
// TODO: Pinch zooming. // TODO: Pinch zooming.
} }
} }
self.last_touch_point = Some(point);
} }
fn on_touch_up(&mut self, identifier: TouchId, point: TypedPoint2D<DevicePixel, f32>) { fn on_touch_up(&mut self, identifier: TouchId, point: TypedPoint2D<DevicePixel, f32>) {
@ -1321,7 +1311,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
TouchState::Nothing TouchState::Nothing
} }
TouchState::Nothing | TouchState::Nothing |
TouchState::Panning | TouchState::Panning(_) |
TouchState::WaitingForScript(1) | TouchState::WaitingForScript(1) |
TouchState::DefaultPrevented(1) | TouchState::DefaultPrevented(1) |
TouchState::MultiTouch(1) => { TouchState::MultiTouch(1) => {
@ -1343,7 +1333,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
self.touch_gesture_state = match self.touch_gesture_state { self.touch_gesture_state = match self.touch_gesture_state {
TouchState::Nothing | TouchState::Nothing |
TouchState::Touching | TouchState::Touching |
TouchState::Panning | TouchState::Panning(_) |
TouchState::WaitingForScript(1) | TouchState::WaitingForScript(1) |
TouchState::DefaultPrevented(1) | TouchState::DefaultPrevented(1) |
TouchState::MultiTouch(1) => { TouchState::MultiTouch(1) => {