Skip to content
Permalink
Browse files

Properly set event.buttons value on mousemove

  • Loading branch information
paulrouget committed Nov 11, 2019
1 parent f7fb130 commit 42ee1a86f6b228fc7b6eb310fecd0a70fe95fb2a
@@ -779,11 +779,7 @@ impl<Window: WindowMethods + ?Sized> IOCompositor<Window> {
let results = self.hit_test_at_point(cursor);
if let Some(item) = results.items.first() {
let node_address = Some(UntrustedNodeAddress(item.tag.0 as *const c_void));
let event = MouseMoveEvent(
Some(item.point_in_viewport.to_untyped()),
node_address,
MouseButton::Left as u16,
);
let event = MouseMoveEvent(Some(item.point_in_viewport.to_untyped()), node_address, 0);
let pipeline_id = PipelineId::from_webrender(item.pipeline);
let msg = ConstellationMsg::ForwardEvent(pipeline_id, event);
if let Err(e) = self.constellation_chan.send(msg) {
@@ -2286,6 +2286,10 @@ where
_ => event,
};

if let MouseButtonEvent(MouseEventType::Click, ..) = event {
self.pressed_mouse_buttons = 0;
}

let msg = ConstellationControlMsg::SendEvent(destination_pipeline_id, event);
let result = match self.pipelines.get(&destination_pipeline_id) {
None => {
@@ -159,6 +159,7 @@ void ServoControl::OnSurfacePointerMoved(
auto point = e.GetCurrentPoint(Panel());
auto x = point.Position().X * mDPI;
auto y = point.Position().Y * mDPI;
e.Handled(true);
RunOnGLThread([=] { mServo->MouseMove(x, y); });
}
}

0 comments on commit 42ee1a8

Please sign in to comment.
You can’t perform that action at this time.