Skip to content

MacOS: Fix tracking of phase changes for mousewheel (scroll) on trackpad #2158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
madsmtm merged 6 commits into from
Aug 10, 2022
Merged

MacOS: Fix tracking of phase changes for mousewheel (scroll) on trackpad #2158

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8d0e9ab
Fixed phase tracking
apessino Jan 21, 2022
34b4222
Ran cargo fmt
apessino Jan 21, 2022
7471d43
Added momentum phase handling
apessino Jan 29, 2022
0b10064
Merge branch 'rust-windowing:master' into master
apessino May 28, 2022
6869e1f
Merge branch 'rust-windowing:master' into master
apessino Jun 2, 2022
cca41e0
Merge branch 'rust-windowing:master' into master
apessino Aug 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/platform_impl/macos/view.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1148,12 +1148,27 @@ extern "C" fn scroll_wheel(this: &Object, _sel: Sel, event: id) {
MouseScrollDelta::LineDelta(x as f32, y as f32)
}
};
let phase = match event.phase() {

// The "momentum phase," if any, has higher priority than touch phase (the two should
// be mutually exclusive anyhow, which is why the API is rather incoherent). If no momentum
// phase is recorded (or rather, the started/ended cases of the momentum phase) then we
// report the touch phase.
let phase = match event.momentumPhase() {
NSEventPhase::NSEventPhaseMayBegin | NSEventPhase::NSEventPhaseBegan => {
TouchPhase::Started
}
NSEventPhase::NSEventPhaseEnded => TouchPhase::Ended,
_ => TouchPhase::Moved,
NSEventPhase::NSEventPhaseEnded | NSEventPhase::NSEventPhaseCancelled => {
Copy link
Copy Markdown
Member

@madsmtm madsmtm Aug 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have TouchPhase::Cancelled now, so maybe we should use that?

Copy link
Copy Markdown
Member

@madsmtm madsmtm Aug 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On second thought, I don't think that makes sense if we don't have a TouchPhase::MayBegin event - a "cancelled" scroll doesn't communicate anything other than an ended scroll in our case.

TouchPhase::Ended
}
_ => match event.phase() {
NSEventPhase::NSEventPhaseMayBegin | NSEventPhase::NSEventPhaseBegan => {
TouchPhase::Started
}
NSEventPhase::NSEventPhaseEnded | NSEventPhase::NSEventPhaseCancelled => {
TouchPhase::Ended
}
_ => TouchPhase::Moved,
},
};

let device_event = Event::DeviceEvent {
Expand Down