From 8066a226f3ac6df3b5e591384a127ba8d81f2700 Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 16:37:43 +0100 Subject: web: keep browser from stealing the pinch gesture Firefox on Android may consume two-finger pinch for page zooming despite touch-action: none on the canvas. Disable page zooming via the viewport meta (maximum-scale=1, user-scalable=no) so the gesture reaches the app as pointer events; the app provides its own zoom. Also join touch pointers seen only via pointermove into the pointer table, so a swallowed second pointerdown cannot break pinch. --- crates/wipfel/src/canvas_view.rs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'crates/wipfel/src/canvas_view.rs') diff --git a/crates/wipfel/src/canvas_view.rs b/crates/wipfel/src/canvas_view.rs index b962f17..ac1d6ab 100644 --- a/crates/wipfel/src/canvas_view.rs +++ b/crates/wipfel/src/canvas_view.rs @@ -432,8 +432,16 @@ pub fn canvas_view(props: &Props) -> Html { // update the pointer table and handle two-finger pinch let pinch_ev = { let mut d = drag.borrow_mut(); - if let Some(p) = d.pts.iter_mut().find(|(id, _)| *id == e.pointer_id()) { - p.1 = (e.client_x() as f64, e.client_y() as f64); + let pos = (e.client_x() as f64, e.client_y() as f64); + match d.pts.iter_mut().find(|(id, _)| *id == e.pointer_id()) { + Some(p) => p.1 = pos, + // a touch pointermove for a pointer we never saw go + // down (lost pointerdown, e.g. swallowed by the + // browser) — join it so pinch still works + None if e.pointer_type() == "touch" && e.buttons() != 0 => { + d.pts.push((e.pointer_id(), pos)); + } + None => {} } if d.pts.len() >= 2 { let (x1, y1) = d.pts[0].1; -- cgit v1.2.3