Skip to content

Commit

Permalink
Fix pinch-to-zoom on web by using the "artificial" modifier keys (emi…
Browse files Browse the repository at this point in the history
…lk#4619)

* Introduced in emilk#4524
* Closes emilk#4615
  • Loading branch information
emilk authored and hacknus committed Oct 30, 2024
1 parent 9e38ec5 commit f495ad3
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 1 deletion.
5 changes: 4 additions & 1 deletion crates/eframe/src/web/events.rs
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,10 @@ pub(crate) fn install_canvas_events(runner_ref: &WebRunner) -> Result<(), JsValu
};
// delta sign is flipped to match native (winit) convention.
let delta = -egui::vec2(event.delta_x() as f32, event.delta_y() as f32);
let modifiers = runner.input.raw.modifiers;

// 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);

runner.input.raw.events.push(egui::Event::MouseWheel {
unit,
Expand Down
16 changes: 16 additions & 0 deletions crates/eframe/src/web/input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -156,3 +156,19 @@ pub fn modifiers_from_mouse_event(event: &web_sys::MouseEvent) -> egui::Modifier
command: event.ctrl_key() || event.meta_key(),
}
}

pub fn modifiers_from_wheel_event(event: &web_sys::WheelEvent) -> egui::Modifiers {
egui::Modifiers {
alt: event.alt_key(),
ctrl: event.ctrl_key(),
shift: event.shift_key(),

// Ideally we should know if we are running or mac or not,
// but this works good enough for now.
mac_cmd: event.meta_key(),

// Ideally we should know if we are running or mac or not,
// but this works good enough for now.
command: event.ctrl_key() || event.meta_key(),
}
}

0 comments on commit f495ad3

Please sign in to comment.