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

compositing: Send mouse events to the right pipeline when using

Browse source 
WebRender.

Fixes mouse events in browser.html.

Requires servo/webrender_traits#47 and servo/webrender#272.
This commit is contained in:
Patrick Walton 2016-05-03 18:37:49 -07:00
parent b4f573db1a
commit 91907f563b
7 changed files with 73 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

22
components/compositing/compositor.rs
View file

@ -1355,7 +1355,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
None => return,
};
let translated_point =
let (translated_point, translated_pipeline_id) =
webrender_api.translate_point_to_layer_space(&point.to_untyped());
let event_to_send = match mouse_window_event {
MouseWindowEvent::Click(button, _) => {
@ -1368,9 +1368,12 @@ impl<Window: WindowMethods> IOCompositor<Window> {
MouseButtonEvent(MouseEventType::MouseUp, button, translated_point)
}
};
let msg = ConstellationControlMsg::SendEvent(root_pipeline_id, event_to_send);
if let Err(e) = root_pipeline.script_chan.send(msg) {
warn!("Sending control event to root script failed ({}).", e);
let translated_pipeline_id = translated_pipeline_id.from_webrender();
let msg = ConstellationControlMsg::SendEvent(translated_pipeline_id, event_to_send);
if let Some(pipeline) = self.pipeline(translated_pipeline_id) {
if let Err(e) = pipeline.script_chan.send(msg) {
warn!("Sending control event to script failed ({}).", e);
}
}
return
}
@ -1397,12 +1400,15 @@ impl<Window: WindowMethods> IOCompositor<Window> {
None => return,
};
let translated_point =
let (translated_point, translated_pipeline_id) =
webrender_api.translate_point_to_layer_space(&cursor.to_untyped());
let translated_pipeline_id = translated_pipeline_id.from_webrender();
let event_to_send = MouseMoveEvent(Some(translated_point));
let msg = ConstellationControlMsg::SendEvent(root_pipeline_id, event_to_send);
if let Err(e) = root_pipeline.script_chan.send(msg) {
warn!("Sending mouse control event to root script failed ({}).", e);
let msg = ConstellationControlMsg::SendEvent(translated_pipeline_id, event_to_send);
if let Some(pipeline) = self.pipeline(translated_pipeline_id) {
if let Err(e) = pipeline.script_chan.send(msg) {
warn!("Sending mouse control event to script failed ({}).", e);
}
}
return
}