migrations/winit
1
0
Fork 0
mirror of https://github.com/rust-windowing/winit.git synced 2026-09-02 14:50:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Unwrap axis id in raw mouse motion on Mac

Browse Source
This commit is contained in:
Tristam MacDonald
2017-07-29 07:56:08 -07:00
parent 6820e2a826
commit 15c4641758
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/platform/macos/events_loop.rs
View File

@@ -7,7 +7,6 @@ use std::sync::{Arc, Mutex, Weak};
use super::window::Window; use super::window::Window;
use std; use std;
use super::DeviceId; use super::DeviceId;
use AxisId;
pub struct EventsLoop { pub struct EventsLoop {
@@ -481,14 +480,14 @@ impl EventsLoop {
let delta_x = (scale_factor * ns_event.deltaX() as f32) as f64; let delta_x = (scale_factor * ns_event.deltaX() as f32) as f64;
if delta_x != 0.0 { if delta_x != 0.0 {
let motion_event = DeviceEvent::Motion { axis: AxisId(0), value: delta_x }; let motion_event = DeviceEvent::Motion { axis: 0, value: delta_x };
let event = Event::DeviceEvent{ device_id: DEVICE_ID, event: motion_event }; let event = Event::DeviceEvent{ device_id: DEVICE_ID, event: motion_event };
events.push_back(event); events.push_back(event);
} }
let delta_y = (scale_factor * ns_event.deltaY() as f32) as f64; let delta_y = (scale_factor * ns_event.deltaY() as f32) as f64;
if delta_y != 0.0 { if delta_y != 0.0 {
let motion_event = DeviceEvent::Motion { axis: AxisId(1), value: delta_y }; let motion_event = DeviceEvent::Motion { axis: 1, value: delta_y };
let event = Event::DeviceEvent{ device_id: DEVICE_ID, event: motion_event }; let event = Event::DeviceEvent{ device_id: DEVICE_ID, event: motion_event };
events.push_back(event); events.push_back(event);
} }