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

Auto merge of #8215 - mrobinson:glutin-pinch-sim, r=glennw

Browse source 
Implement pinch zoom emulation to the glutin port

The GLFW port had pinch zoom emulation that could be triggered by
holding control and using the mouse wheel. This was very useful for
testing pinch zoom behavior on desktop machines. This commit
implements this for the glutin port.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8215)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-26 21:01:00 -05:00
commit e49c7a3acb
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
ports/glutin/window.rs
View file

@ -200,11 +200,20 @@ impl Window {
WindowEvent::MouseWindowMoveEventClass(Point2D::typed(x as f32, y as f32))); WindowEvent::MouseWindowMoveEventClass(Point2D::typed(x as f32, y as f32)));
} }
Event::MouseWheel(delta) => { Event::MouseWheel(delta) => {
match delta { let (dx, dy) = match delta {
MouseScrollDelta::LineDelta(dx, dy) => { MouseScrollDelta::LineDelta(dx, dy) => (dx, dy * LINE_HEIGHT),
self.scroll_window(dx, dy * LINE_HEIGHT); MouseScrollDelta::PixelDelta(dx, dy) => (dx, dy),
} };
MouseScrollDelta::PixelDelta(dx, dy) => self.scroll_window(dx, dy)
if !self.key_modifiers.get().intersects(LEFT_CONTROL | RIGHT_CONTROL) {
self.scroll_window(dx, dy);
} else {
let factor = if dy > 0. {
1.1
} else {
1.0 / 1.1
};
self.pinch_zoom(factor);
} }
}, },
Event::Refresh => { Event::Refresh => {
@ -225,6 +234,10 @@ impl Window {
self.key_modifiers.set(modifiers); self.key_modifiers.set(modifiers);
} }
fn pinch_zoom(&self, factor: f32) {
self.event_queue.borrow_mut().push(WindowEvent::PinchZoom(factor));
}
/// Helper function to send a scroll event. /// Helper function to send a scroll event.
fn scroll_window(&self, dx: f32, dy: f32) { fn scroll_window(&self, dx: f32, dy: f32) {
let mouse_pos = self.mouse_pos.get(); let mouse_pos = self.mouse_pos.get();