mirror of
https://github.com/servo/servo.git
synced 2025-06-13 10:54:29 +00:00
Auto merge of #9811 - paulrouget:forceTouch, r=mbrubeck
forcetouch events https://developer.apple.com/library/mac/documentation/AppleApplications/Conceptual/SafariJSProgTopics/RespondingtoForceTouchEventsfromJavaScript.html Not sure how we want to land that yet. Maybe reproduce the webkit events (as in this PR), or as touch/mousemouse events. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9811) <!-- Reviewable:end -->
This commit is contained in:
commit
0ff8adb097
14 changed files with 246 additions and 8 deletions
|
@ -227,10 +227,23 @@ pub enum CompositorEvent {
|
|||
MouseMoveEvent(Option<Point2D<f32>>),
|
||||
/// A touch event was generated with a touch ID and location.
|
||||
TouchEvent(TouchEventType, TouchId, Point2D<f32>),
|
||||
/// Touchpad pressure event
|
||||
TouchpadPressureEvent(Point2D<f32>, f32, TouchpadPressurePhase),
|
||||
/// A key was pressed.
|
||||
KeyEvent(Key, KeyState, KeyModifiers),
|
||||
}
|
||||
|
||||
/// Touchpad pressure phase for TouchpadPressureEvent.
|
||||
#[derive(Copy, Clone, HeapSizeOf, PartialEq, Deserialize, Serialize)]
|
||||
pub enum TouchpadPressurePhase {
|
||||
/// Pressure before a regular click.
|
||||
BeforeClick,
|
||||
/// Pressure after a regular click.
|
||||
AfterFirstClick,
|
||||
/// Pressure after a "forceTouch" click
|
||||
AfterSecondClick,
|
||||
}
|
||||
|
||||
/// An opaque wrapper around script<->layout channels to avoid leaking message types into
|
||||
/// crates that don't need to know about them.
|
||||
pub struct OpaqueScriptLayoutChannel(pub (Box<Any + Send>, Box<Any + Send>));
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue