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

Auto merge of #5725 - pgonda:dispatch-mousedown-mouseup, r=jdm

Browse source 
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5725)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-04-30 12:22:03 -05:00
commit 88ed4e58e1
4 changed files with 79 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ports/glutin/window.rs
View file

@ -237,21 +237,22 @@ impl Window {
MouseWindowEvent::MouseDown(MouseButton::Left, TypedPoint2D(x as f32, y as f32))
}
ElementState::Released => {
let mouse_up_event = MouseWindowEvent::MouseUp(MouseButton::Left, TypedPoint2D(x as f32, y as f32));
match self.mouse_down_button.get() {
None => (),
None => mouse_up_event,
Some(but) if button == but => {
let pixel_dist = self.mouse_down_point.get() - Point2D(x, y);
let pixel_dist = ((pixel_dist.x * pixel_dist.x +
pixel_dist.y * pixel_dist.y) as f64).sqrt();
if pixel_dist < max_pixel_dist {
let click_event = MouseWindowEvent::Click(
MouseButton::Left, TypedPoint2D(x as f32, y as f32));
self.event_queue.borrow_mut().push(WindowEvent::MouseWindowEventClass(click_event));
self.event_queue.borrow_mut().push(WindowEvent::MouseWindowEventClass(mouse_up_event));
MouseWindowEvent::Click(MouseButton::Left, TypedPoint2D(x as f32, y as f32))
} else {
mouse_up_event
}
}
Some(_) => (),
},
Some(_) => mouse_up_event,
}
MouseWindowEvent::MouseUp(MouseButton::Left, TypedPoint2D(x as f32, y as f32))
}
};
self.event_queue.borrow_mut().push(WindowEvent::MouseWindowEventClass(event));