alex/winit-sonoma-fix
1
0
Fork 0
mirror of https://github.com/italicsjenga/winit-sonoma-fix.git synced 2024-12-25 23:01:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #718 from paulrouget/hidpiwheel

Browse source 
osx: scroll delta should take hidpi factor into account
This commit is contained in:
tomaka 2016-02-02 10:53:11 +01:00
parent 5288b7dfc6 99073eec7b
commit b63070db25
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/api/cocoa/mod.rs
View file

@ -881,10 +881,13 @@ unsafe fn NSEventToEvent(window: &Window, nsevent: id) -> Option<Event> {
}, },
NSScrollWheel => { NSScrollWheel => {
use events::MouseScrollDelta::{LineDelta, PixelDelta}; use events::MouseScrollDelta::{LineDelta, PixelDelta};
let scale_factor = window.hidpi_factor();
let delta = if nsevent.hasPreciseScrollingDeltas() == YES { let delta = if nsevent.hasPreciseScrollingDeltas() == YES {
PixelDelta(nsevent.scrollingDeltaX() as f32, nsevent.scrollingDeltaY() as f32) PixelDelta(scale_factor * nsevent.scrollingDeltaX() as f32,
scale_factor * nsevent.scrollingDeltaY() as f32)
} else { } else {
LineDelta(nsevent.scrollingDeltaX() as f32, nsevent.scrollingDeltaY() as f32) LineDelta(scale_factor * nsevent.scrollingDeltaX() as f32,
scale_factor * nsevent.scrollingDeltaY() as f32)
}; };
Some(MouseWheel(delta)) Some(MouseWheel(delta))
}, },