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

Convert logical glutin coordinates to physical coordinates for input events.

Browse source
This commit is contained in:
Josh Matthews 2018-07-16 22:55:45 -04:00
parent 8eb2a53e20
commit b260052753
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ports/servo/glutin_app/window.rs
View file

@ -493,12 +493,14 @@ impl Window {
}, },
Event::WindowEvent { Event::WindowEvent {
event: winit::WindowEvent::CursorMoved { event: winit::WindowEvent::CursorMoved {
position: LogicalPosition { x, y }, position,
.. ..
}, },
.. ..
} => { } => {
self.mouse_pos.set(TypedPoint2D::new(x as i32, y as i32)); let pos = position.to_physical(self.hidpi_factor().get() as f64);
let (x, y): (i32, i32) = pos.into();
self.mouse_pos.set(TypedPoint2D::new(x, y));
self.event_queue.borrow_mut().push( self.event_queue.borrow_mut().push(
WindowEvent::MouseWindowMoveEventClass(TypedPoint2D::new(x as f32, y as f32))); WindowEvent::MouseWindowMoveEventClass(TypedPoint2D::new(x as f32, y as f32)));
} }
@ -508,7 +510,10 @@ impl Window {
} => { } => {
let (mut dx, mut dy) = match delta { let (mut dx, mut dy) = match delta {
MouseScrollDelta::LineDelta(dx, dy) => (dx, dy * LINE_HEIGHT), MouseScrollDelta::LineDelta(dx, dy) => (dx, dy * LINE_HEIGHT),
MouseScrollDelta::PixelDelta(LogicalPosition { x: dx, y: dy }) => (dx as f32, dy as f32), MouseScrollDelta::PixelDelta(position) => {
let position = position.to_physical(self.hidpi_factor().get() as f64);
(position.x as f32, position.y as f32)
}
}; };
// Scroll events snap to the major axis of movement, with vertical // Scroll events snap to the major axis of movement, with vertical
// preferred over horizontal. // preferred over horizontal.
@ -531,7 +536,8 @@ impl Window {
let phase = winit_phase_to_touch_event_type(touch.phase); let phase = winit_phase_to_touch_event_type(touch.phase);
let id = TouchId(touch.id as i32); let id = TouchId(touch.id as i32);
let point = TypedPoint2D::new(touch.location.x as f32, touch.location.y as f32); let position = touch.location.to_physical(self.hidpi_factor().get() as f64);
let point = TypedPoint2D::new(position.x as f32, position.y as f32);
self.event_queue.borrow_mut().push(WindowEvent::Touch(phase, id, point)); self.event_queue.borrow_mut().push(WindowEvent::Touch(phase, id, point));
} }
Event::WindowEvent { Event::WindowEvent {
@ -545,17 +551,18 @@ impl Window {
self.event_queue.borrow_mut().push(WindowEvent::Quit); self.event_queue.borrow_mut().push(WindowEvent::Quit);
} }
Event::WindowEvent { Event::WindowEvent {
event: winit::WindowEvent::Resized(LogicalSize { width, height }), event: winit::WindowEvent::Resized(size),
.. ..
} => { } => {
// width and height are DevicePixel. // width and height are DeviceIndependentPixel.
// window.resize() takes DevicePixel. // window.resize() takes DevicePixel.
if let WindowKind::Window(ref window, _) = self.kind { if let WindowKind::Window(ref window, _) = self.kind {
window.resize(PhysicalSize { width, height }); let size = size.to_physical(self.hidpi_factor().get() as f64);
window.resize(size);
} }
// window.set_inner_size() takes DeviceIndependentPixel. // window.set_inner_size() takes DeviceIndependentPixel.
let new_size = TypedSize2D::new(width as f32, height as f32); let (width, height) = size.into();
let new_size = (new_size / self.hidpi_factor()).to_u32(); let new_size = TypedSize2D::new(width, height);
if self.inner_size.get() != new_size { if self.inner_size.get() != new_size {
self.inner_size.set(new_size); self.inner_size.set(new_size);
self.event_queue.borrow_mut().push(WindowEvent::Resize); self.event_queue.borrow_mut().push(WindowEvent::Resize);