mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
remove forcetouch support
This commit is contained in:
parent
019fdaa1bd
commit
e7c754fb64
12 changed files with 7 additions and 240 deletions
|
@ -18,8 +18,8 @@ use nonzero::NonZero;
|
|||
use profile_traits::time::{self, ProfilerCategory, profile};
|
||||
use script_traits::{AnimationState, AnimationTickType, ConstellationMsg, LayoutControlMsg};
|
||||
use script_traits::{MouseButton, MouseEventType, ScrollState, TouchEventType, TouchId};
|
||||
use script_traits::{TouchpadPressurePhase, UntrustedNodeAddress, WindowSizeData, WindowSizeType};
|
||||
use script_traits::CompositorEvent::{MouseMoveEvent, MouseButtonEvent, TouchEvent, TouchpadPressureEvent};
|
||||
use script_traits::{UntrustedNodeAddress, WindowSizeData, WindowSizeType};
|
||||
use script_traits::CompositorEvent::{MouseMoveEvent, MouseButtonEvent, TouchEvent};
|
||||
use servo_config::opts;
|
||||
use servo_config::prefs::PREFS;
|
||||
use servo_geometry::DeviceIndependentPixel;
|
||||
|
@ -864,31 +864,6 @@ impl<Window: WindowMethods> IOCompositor<Window> {
|
|||
self.send_touch_event(TouchEventType::Cancel, identifier, point);
|
||||
}
|
||||
|
||||
pub fn on_touchpad_pressure_event(&self,
|
||||
point: TypedPoint2D<f32, DevicePixel>,
|
||||
pressure: f32,
|
||||
phase: TouchpadPressurePhase) {
|
||||
match PREFS.get("dom.forcetouch.enabled").as_boolean() {
|
||||
Some(true) => {},
|
||||
_ => return,
|
||||
}
|
||||
|
||||
let results = self.hit_test_at_point(point);
|
||||
if let Some(item) = results.items.first() {
|
||||
let event = TouchpadPressureEvent(
|
||||
item.point_in_viewport.to_untyped(),
|
||||
pressure,
|
||||
phase,
|
||||
Some(UntrustedNodeAddress(item.tag.0 as *const c_void)),
|
||||
);
|
||||
let pipeline_id = PipelineId::from_webrender(item.pipeline);
|
||||
let msg = ConstellationMsg::ForwardEvent(pipeline_id, event);
|
||||
if let Err(e) = self.constellation_chan.send(msg) {
|
||||
warn!("Sending event to constellation failed ({}).", e);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <http://w3c.github.io/touch-events/#mouse-events>
|
||||
fn simulate_mouse_click(&mut self, p: TypedPoint2D<f32, DevicePixel>) {
|
||||
let button = MouseButton::Left;
|
||||
|
|
|
@ -11,7 +11,7 @@ use gleam::gl;
|
|||
use ipc_channel::ipc::IpcSender;
|
||||
use msg::constellation_msg::{Key, KeyModifiers, KeyState, TopLevelBrowsingContextId, TraversalDirection};
|
||||
use net_traits::net_error_list::NetError;
|
||||
use script_traits::{LoadData, MouseButton, TouchEventType, TouchId, TouchpadPressurePhase};
|
||||
use script_traits::{LoadData, MouseButton, TouchEventType, TouchId};
|
||||
use servo_geometry::DeviceIndependentPixel;
|
||||
use servo_url::ServoUrl;
|
||||
use std::fmt::{Debug, Error, Formatter};
|
||||
|
@ -50,8 +50,6 @@ pub enum WindowEvent {
|
|||
Refresh,
|
||||
/// Sent when the window is resized.
|
||||
Resize,
|
||||
/// Touchpad Pressure
|
||||
TouchpadPressure(TypedPoint2D<f32, DevicePixel>, f32, TouchpadPressurePhase),
|
||||
/// Sent when a new URL is to be loaded.
|
||||
LoadUrl(TopLevelBrowsingContextId, ServoUrl),
|
||||
/// Sent when a mouse hit test is to be performed.
|
||||
|
@ -94,7 +92,6 @@ impl Debug for WindowEvent {
|
|||
WindowEvent::Idle => write!(f, "Idle"),
|
||||
WindowEvent::Refresh => write!(f, "Refresh"),
|
||||
WindowEvent::Resize => write!(f, "Resize"),
|
||||
WindowEvent::TouchpadPressure(..) => write!(f, "TouchpadPressure"),
|
||||
WindowEvent::KeyEvent(..) => write!(f, "Key"),
|
||||
WindowEvent::LoadUrl(..) => write!(f, "LoadUrl"),
|
||||
WindowEvent::MouseWindowEventClass(..) => write!(f, "Mouse"),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue