Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -110,4 +110,5 @@ fabric.properties

# Resource Metadata
*.meta
*.registry
*.registry
.DS_Store
16 changes: 15 additions & 1 deletion fyrox-impl/src/utils/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,21 @@ pub fn translate_event(event: &WindowEvent) -> Option<OsEvent> {
WindowEvent::MouseWheel { delta, .. } => match delta {
MouseScrollDelta::LineDelta(x, y) => Some(OsEvent::MouseWheel(*x, *y)),
MouseScrollDelta::PixelDelta(pos) => {
Some(OsEvent::MouseWheel(pos.x as f32, pos.y as f32))
#[cfg(target_os = "macos")]
{
// macOS trackpads emits pixel deltas; scale to line-like units to avoid excessive scroll speed.
const PIXELS_PER_LINE: f32 = 100.0;

Some(OsEvent::MouseWheel(
pos.x as f32 / PIXELS_PER_LINE,
pos.y as f32 / PIXELS_PER_LINE,
))
}

#[cfg(not(target_os = "macos"))]
{
Some(OsEvent::MouseWheel(pos.x as f32, pos.y as f32))
}
}
},
WindowEvent::MouseInput { state, button, .. } => Some(OsEvent::MouseInput {
Expand Down