From 344b13444fe8ee9825ed33f8676d6091c70a77cb Mon Sep 17 00:00:00 2001 From: Johannes Hofmann Date: Tue, 27 Oct 2026 16:46:35 +0100 Subject: web: pinch diagnostics in status line + resilient pointer table MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Second data point needed for the mobile pinch issue: the status line now shows pointer activity (pointerdown id/pts, pointercancel id/pts, pinch distance) so it is visible on the phone whether the second pointer arrives at all or whether the browser cancels pointers when pinching. Also: only capture the primary pointer (capturing every finger confuses some mobile browsers), and pointercancel now removes just that pointer instead of clearing the table — a browser that 'cancels' finger one as finger two lands no longer makes pinch impossible to form. --- crates/wipfel/src/app.rs | 4 +++ crates/wipfel/src/canvas_view.rs | 73 ++++++++++++++++++++++++++------------- dist/wipfel/wipfel.js | 4 +-- dist/wipfel/wipfel_bg.wasm | Bin 509301 -> 510826 bytes 4 files changed, 55 insertions(+), 26 deletions(-) diff --git a/crates/wipfel/src/app.rs b/crates/wipfel/src/app.rs index cc9f558..c4a42df 100644 --- a/crates/wipfel/src/app.rs +++ b/crates/wipfel/src/app.rs @@ -769,6 +769,10 @@ pub fn app() -> Html { let hover = hover.clone(); Callback::from(move |_: ()| hover.set(None)) }, + debug: { + let status = status.clone(); + Callback::from(move |s: String| status.set(s)) + }, }; // Lens FOV visibility limit, port of the desktop bump(): the angle at diff --git a/crates/wipfel/src/canvas_view.rs b/crates/wipfel/src/canvas_view.rs index ac1d6ab..5806843 100644 --- a/crates/wipfel/src/canvas_view.rs +++ b/crates/wipfel/src/canvas_view.rs @@ -63,6 +63,8 @@ pub struct ViewCallbacks { pub hover: Callback<(f64, f64)>, /// pointer left the canvas pub hover_end: Callback<()>, + /// diagnostic text for the status line (pinch debugging on mobile) + pub debug: Callback, } #[derive(Properties, PartialEq)] @@ -375,11 +377,9 @@ pub fn canvas_view(props: &Props) -> Html { let markers = props.markers.clone(); let view = props.view.clone(); let bitmap = props.bitmap.clone(); + let debug = props.callbacks.debug.clone(); Callback::from(move |e: PointerEvent| { e.prevent_default(); - if let Some(c) = canvas_ref.cast::() { - let _ = c.set_pointer_capture(e.pointer_id()); - } let rect = canvas_ref .cast::() .map(|c| c.get_bounding_client_rect()); @@ -402,20 +402,33 @@ pub fn canvas_view(props: &Props) -> Html { } } let pos = (e.client_x() as f64, e.client_y() as f64); - let mut d = drag.borrow_mut(); - d.pts.push((e.pointer_id(), pos)); - if d.pts.len() >= 2 { - // second finger: switch to pinch, cancel any pan/marker - // drag so the view does not jump - d.mode = None; - d.pinch = None; - d.moved = true; - } else { - d.mode = Some(mode); - d.last = pos; - d.start = pos; - d.moved = false; + let n = { + let mut d = drag.borrow_mut(); + d.pts.retain(|(id, _)| *id != e.pointer_id()); + d.pts.push((e.pointer_id(), pos)); + let n = d.pts.len(); + if n >= 2 { + // second finger: switch to pinch, cancel any pan/marker + // drag so the view does not jump + d.mode = None; + d.pinch = None; + d.moved = true; + } else { + d.mode = Some(mode); + d.last = pos; + d.start = pos; + d.moved = false; + } + n + }; + // capture only the primary pointer; capturing every finger + // confuses some mobile browsers + if n == 1 { + if let Some(c) = canvas_ref.cast::() { + let _ = c.set_pointer_capture(e.pointer_id()); + } } + debug.emit(format!("pointerdown id={} pts={n}", e.pointer_id())); }) }; @@ -427,6 +440,7 @@ pub fn canvas_view(props: &Props) -> Html { let hover = props.callbacks.hover.clone(); let to_img = to_img.clone(); let canvas_ref = props.canvas_ref.clone(); + let debug = props.callbacks.debug.clone(); let scale = props.view.scale; Callback::from(move |e: PointerEvent| { // update the pointer table and handle two-finger pinch @@ -464,13 +478,15 @@ pub fn canvas_view(props: &Props) -> Html { }; d.pinch = Some((dist, cx, cy)); d.moved = true; - Some(ev) + let dbg = format!("pinch pts=2 d={dist:.0}"); + (ev, dbg) } else { - None + (None, String::new()) } }; - if let Some(ev) = pinch_ev { - if let Some((factor, cx, cy, dx, dy)) = ev { + if !pinch_ev.1.is_empty() { + debug.emit(pinch_ev.1); + if let Some((factor, cx, cy, dx, dy)) = pinch_ev.0 { zoom_cb.emit((cx, cy, factor)); pan_cb.emit((dx, dy)); } @@ -548,11 +564,20 @@ pub fn canvas_view(props: &Props) -> Html { let on_pointercancel = { let drag = drag.clone(); - Callback::from(move |_: PointerEvent| { + let debug = props.callbacks.debug.clone(); + Callback::from(move |e: PointerEvent| { let mut d = drag.borrow_mut(); - d.mode = None; - d.pts.clear(); - d.pinch = None; + // do NOT clear the whole table: when a mobile browser + // "cancels" the first finger as the second arrives, a + // blanket clear would make a pinch impossible to form + d.pts.retain(|(id, _)| *id != e.pointer_id()); + if d.pts.len() < 2 { + d.pinch = None; + } + if d.pts.is_empty() { + d.mode = None; + } + debug.emit(format!("pointercancel id={} pts={}", e.pointer_id(), d.pts.len())); }) }; diff --git a/dist/wipfel/wipfel.js b/dist/wipfel/wipfel.js index d312617..e1eedc0 100644 --- a/dist/wipfel/wipfel.js +++ b/dist/wipfel/wipfel.js @@ -605,7 +605,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000002: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 74, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [NamedExternref("Array"), NamedExternref("ResizeObserver")], shim_idx: 75, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke___js_sys_351dd7d36d5f7033___Array__web_sys_d6718dd818f67bd6___features__gen_ResizeObserver__ResizeObserver______true_); return ret; }, @@ -615,7 +615,7 @@ function __wbg_get_imports() { return ret; }, __wbindgen_generic_0000000000000004: function(arg0, arg1) { - // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 76, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. + // Cast intrinsic for `Closure(Closure { owned: true, function: Function { arguments: [], shim_idx: 77, ret: Unit, inner_ret: Some(Unit) }, mutable: false }) -> Externref`. const ret = makeClosure(arg0, arg1, wasm_bindgen_f1f668f83a5f514b___convert__closures_____invoke_______true_); return ret; }, diff --git a/dist/wipfel/wipfel_bg.wasm b/dist/wipfel/wipfel_bg.wasm index cc56f90..6c751d3 100644 Binary files a/dist/wipfel/wipfel_bg.wasm and b/dist/wipfel/wipfel_bg.wasm differ -- cgit v1.2.3