mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2024-12-25 14:51:30 +11:00
Unwrap axis id in raw mouse motion on Mac
This commit is contained in:
parent
6820e2a826
commit
15c4641758
|
@ -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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue