mirror of
https://github.com/italicsjenga/winit-sonoma-fix.git
synced 2025-01-11 13:31:29 +11:00
Fix communication of fractional RI_MOUSE_WHEEL events (Windows) (#1877)
This commit is contained in:
parent
599477d754
commit
86748fbc68
|
@ -1,5 +1,6 @@
|
||||||
# Unreleased
|
# Unreleased
|
||||||
|
|
||||||
|
- On Windows, fix fractional deltas for mouse wheel device events.
|
||||||
- On macOS, fix segmentation fault after dropping the main window.
|
- On macOS, fix segmentation fault after dropping the main window.
|
||||||
- On Android, `InputEvent::KeyEvent` is partially implemented providing the key scancode.
|
- On Android, `InputEvent::KeyEvent` is partially implemented providing the key scancode.
|
||||||
- Added `is_maximized` method to `Window`.
|
- Added `is_maximized` method to `Window`.
|
||||||
|
|
48
examples/mouse_wheel.rs
Normal file
48
examples/mouse_wheel.rs
Normal file
|
@ -0,0 +1,48 @@
|
||||||
|
use simple_logger::SimpleLogger;
|
||||||
|
use winit::{
|
||||||
|
event::{DeviceEvent, Event, WindowEvent},
|
||||||
|
event_loop::{ControlFlow, EventLoop},
|
||||||
|
window::WindowBuilder,
|
||||||
|
};
|
||||||
|
|
||||||
|
fn main() {
|
||||||
|
SimpleLogger::new().init().unwrap();
|
||||||
|
let event_loop = EventLoop::new();
|
||||||
|
|
||||||
|
let window = WindowBuilder::new()
|
||||||
|
.with_title("Mouse Wheel events")
|
||||||
|
.build(&event_loop)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
event_loop.run(move |event, _, control_flow| {
|
||||||
|
*control_flow = ControlFlow::Wait;
|
||||||
|
|
||||||
|
match event {
|
||||||
|
Event::WindowEvent { event, .. } => match event {
|
||||||
|
WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
|
||||||
|
_ => (),
|
||||||
|
},
|
||||||
|
Event::DeviceEvent { event, .. } => match event {
|
||||||
|
DeviceEvent::MouseWheel { delta } => match delta {
|
||||||
|
winit::event::MouseScrollDelta::LineDelta(x, y) => {
|
||||||
|
println!("mouse wheel Line Delta: ({},{})", x, y);
|
||||||
|
let pixels_per_line = 120.0;
|
||||||
|
let mut pos = window.outer_position().unwrap();
|
||||||
|
pos.x -= (x * pixels_per_line) as i32;
|
||||||
|
pos.y -= (y * pixels_per_line) as i32;
|
||||||
|
window.set_outer_position(pos)
|
||||||
|
}
|
||||||
|
winit::event::MouseScrollDelta::PixelDelta(p) => {
|
||||||
|
println!("mouse wheel Pixel Delta: ({},{})", p.x, p.y);
|
||||||
|
let mut pos = window.outer_position().unwrap();
|
||||||
|
pos.x -= p.x as i32;
|
||||||
|
pos.y -= p.y as i32;
|
||||||
|
window.set_outer_position(pos)
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => (),
|
||||||
|
},
|
||||||
|
_ => (),
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
|
@ -2101,11 +2101,12 @@ unsafe extern "system" fn thread_event_target_callback<T: 'static>(
|
||||||
}
|
}
|
||||||
|
|
||||||
if util::has_flag(mouse.usButtonFlags, winuser::RI_MOUSE_WHEEL) {
|
if util::has_flag(mouse.usButtonFlags, winuser::RI_MOUSE_WHEEL) {
|
||||||
let delta = mouse.usButtonData as SHORT / winuser::WHEEL_DELTA;
|
let delta =
|
||||||
|
mouse.usButtonData as SHORT as f32 / winuser::WHEEL_DELTA as f32;
|
||||||
subclass_input.send_event(Event::DeviceEvent {
|
subclass_input.send_event(Event::DeviceEvent {
|
||||||
device_id,
|
device_id,
|
||||||
event: MouseWheel {
|
event: MouseWheel {
|
||||||
delta: LineDelta(0.0, delta as f32),
|
delta: LineDelta(0.0, delta),
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue