Skip to content

Commit 86748fb

Browse files
authored
Fix communication of fractional RI_MOUSE_WHEEL events (Windows) (#1877)
1 parent 599477d commit 86748fb

File tree

3 files changed

+52
-2
lines changed

3 files changed

+52
-2
lines changed

CHANGELOG.md

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# Unreleased
22

3+
- On Windows, fix fractional deltas for mouse wheel device events.
34
- On macOS, fix segmentation fault after dropping the main window.
45
- On Android, `InputEvent::KeyEvent` is partially implemented providing the key scancode.
56
- Added `is_maximized` method to `Window`.

examples/mouse_wheel.rs

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
use simple_logger::SimpleLogger;
2+
use winit::{
3+
event::{DeviceEvent, Event, WindowEvent},
4+
event_loop::{ControlFlow, EventLoop},
5+
window::WindowBuilder,
6+
};
7+
8+
fn main() {
9+
SimpleLogger::new().init().unwrap();
10+
let event_loop = EventLoop::new();
11+
12+
let window = WindowBuilder::new()
13+
.with_title("Mouse Wheel events")
14+
.build(&event_loop)
15+
.unwrap();
16+
17+
event_loop.run(move |event, _, control_flow| {
18+
*control_flow = ControlFlow::Wait;
19+
20+
match event {
21+
Event::WindowEvent { event, .. } => match event {
22+
WindowEvent::CloseRequested => *control_flow = ControlFlow::Exit,
23+
_ => (),
24+
},
25+
Event::DeviceEvent { event, .. } => match event {
26+
DeviceEvent::MouseWheel { delta } => match delta {
27+
winit::event::MouseScrollDelta::LineDelta(x, y) => {
28+
println!("mouse wheel Line Delta: ({},{})", x, y);
29+
let pixels_per_line = 120.0;
30+
let mut pos = window.outer_position().unwrap();
31+
pos.x -= (x * pixels_per_line) as i32;
32+
pos.y -= (y * pixels_per_line) as i32;
33+
window.set_outer_position(pos)
34+
}
35+
winit::event::MouseScrollDelta::PixelDelta(p) => {
36+
println!("mouse wheel Pixel Delta: ({},{})", p.x, p.y);
37+
let mut pos = window.outer_position().unwrap();
38+
pos.x -= p.x as i32;
39+
pos.y -= p.y as i32;
40+
window.set_outer_position(pos)
41+
}
42+
},
43+
_ => (),
44+
},
45+
_ => (),
46+
}
47+
});
48+
}

src/platform_impl/windows/event_loop.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -2101,11 +2101,12 @@ unsafe extern "system" fn thread_event_target_callback<T: 'static>(
21012101
}
21022102

21032103
if util::has_flag(mouse.usButtonFlags, winuser::RI_MOUSE_WHEEL) {
2104-
let delta = mouse.usButtonData as SHORT / winuser::WHEEL_DELTA;
2104+
let delta =
2105+
mouse.usButtonData as SHORT as f32 / winuser::WHEEL_DELTA as f32;
21052106
subclass_input.send_event(Event::DeviceEvent {
21062107
device_id,
21072108
event: MouseWheel {
2108-
delta: LineDelta(0.0, delta as f32),
2109+
delta: LineDelta(0.0, delta),
21092110
},
21102111
});
21112112
}

0 commit comments

Comments
 (0)