skyler
/
egui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make pinch-to-zoom more responsive on web (#4621) 

It's 2x faster than before, more closely matching how pinch-to-zoom
feels natively on Mac
This commit is contained in:
Emil Ernerfeldt 2024-06-05 18:32:04 +02:00 committed by GitHub
parent 4837dc68b3
commit 321d2441c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
crates/eframe/src/web/events.rs
View File

@ -498,18 +498,27 @@ pub(crate) fn install_canvas_events(runner_ref: &WebRunner) -> Result<(), JsValu
web_sys::WheelEvent::DOM_DELTA_PAGE => egui::MouseWheelUnit::Page, web_sys::WheelEvent::DOM_DELTA_PAGE => egui::MouseWheelUnit::Page,
_ => return, _ => return,
}; };
// delta sign is flipped to match native (winit) convention.
let delta = -egui::vec2(event.delta_x() as f32, event.delta_y() as f32); let delta = -egui::vec2(event.delta_x() as f32, event.delta_y() as f32);
// NOTE: pinch-to-zoom on a trackpad will set the `ctrl` modifier on the event,
// even though the user is not holding down ctrl!
let modifiers = modifiers_from_wheel_event(&event); let modifiers = modifiers_from_wheel_event(&event);
runner.input.raw.events.push(egui::Event::MouseWheel { if modifiers.ctrl && !runner.input.raw.modifiers.ctrl {
unit, // The browser is saying the ctrl key is down, but it isn't _really_.
delta, // This happens on pinch-to-zoom on a Mac trackpad.
modifiers, // egui will treat ctrl+scroll as zoom, so it all works.
}); // However, we explicitly handle it here in order to better match the pinch-to-zoom
// speed of a native app, without being sensitive to egui's `scroll_zoom_speed` setting.
let pinch_to_zoom_sensitivity = 0.01; // Feels good on a Mac trackpad in 2024
let zoom_factor = (pinch_to_zoom_sensitivity * delta.y).exp();
runner.input.raw.events.push(egui::Event::Zoom(zoom_factor));
} else {
runner.input.raw.events.push(egui::Event::MouseWheel {
unit,
delta,
modifiers,
});
}
runner.needs_repaint.repaint_asap(); runner.needs_repaint.repaint_asap();
event.stop_propagation(); event.stop_propagation();