From d16496e057e87d55007372590c0d13a379bd3ff2 Mon Sep 17 00:00:00 2001 From: Colin Faulkingham Date: Wed, 4 Nov 2026 21:26:01 +0000 Subject: [PATCH] Navigation: honor reverse zoom for mouse drags (#10354) (#10365) * claim: #10354 * fix(ui): honor reverse zoom for mouse drags --- crates/ui-egui/src/navigation.rs | 80 +++++++++++++++++++++++++++++++- 1 file changed, 79 insertions(+), 1 deletion(-) diff --git a/crates/ui-egui/src/navigation.rs b/crates/ui-egui/src/navigation.rs index eac68d19f..13a2e777a 100644 --- a/crates/ui-egui/src/navigation.rs +++ b/crates/ui-egui/src/navigation.rs @@ -835,7 +835,7 @@ pub(crate) fn handle(app: &mut SolveApp, ui: &mut egui::Ui, rect: Rect, resp: &e let press = ui.input(|i| i.pointer.press_origin()); let anchor = model_zoom_anchor(app, rect, press.or(hover), caps.orbit); let sign = if crate::prefs::nav_preset(&app.preferences.nav).reverse_drag_zoom { -1.0 } else { 1.0 }; - app.cam.zoom_at((f64::from(delta.y) * 0.01 * sign).exp(), anchor); + app.cam.zoom_at((f64::from(delta.y) * 0.01 * sign * crate::prefs::zoom_sign(app)).exp(), anchor); } _ => {} } @@ -1925,6 +1925,84 @@ mod tests { assert!(offenders.is_empty(), "camera input outside navigation::handle; call it instead:\n{}", offenders.join("\n")); } + /// Reverse zoom must affect mouse drags as well as the wheel (#10354). + #[test] + fn drag_zoom_respects_reverse_on_every_canvas() { + use crate::prefs::{NAV_PRESETS, NavButton}; + use egui::{Event, Modifiers, PointerButton, pos2, vec2}; + use serde_json::json; + + let mut bindings = Vec::new(); + for preset in NAV_PRESETS { + for binding in preset.bindings.iter().filter(|binding| binding.mode == super::NavMode::Zoom) { + let button = match binding.button { + NavButton::Left => PointerButton::Primary, + NavButton::Middle => PointerButton::Middle, + NavButton::Right => PointerButton::Secondary, + }; + let keys = binding.keys; + let mods = Modifiers { shift: keys.shift, ctrl: keys.ctrl, command: keys.ctrl, alt: keys.alt, ..Default::default() }; + bindings.push((preset.id, button, mods, false)); + } + } + // The navigation bar's Zoom tool also uses the shared drag handler. + for preset in ["fusion", "creo"] { + bindings.push((preset, PointerButton::Primary, Modifiers::NONE, true)); + } + for (preset, button, mods, tool) in bindings { + for caps in [super::NavCaps::MODEL, super::NavCaps { orbit: false, pick: false }] { + for perspective in [false, true] { + for reverse in [false, true] { + for dy in [-80.0, 80.0] { + let mut app = crate::SolveApp::new(solidcraft_engine::Session::default(), crate::Services::default()); + crate::prefs::set(&mut app, &json!({"nav":preset, "zoom_reverse":reverse, "zoom_stop_at_model":false})).unwrap(); + app.ui.perspective = perspective; + app.cam.fov = if perspective { 45.0_f64.to_radians() } else { 0.0 }; + if tool { + app.run("view.tool", json!({"tool":"zoom"})).unwrap(); + } + let before = app.cam; + let ctx = crate::fonts::test_context(); + let mut frame = |mut events: Vec| { + events.insert(0, Event::ModifiersChanged(mods)); + let raw = egui::RawInput { + screen_rect: Some(egui::Rect::from_min_size(egui::Pos2::ZERO, vec2(800.0, 600.0))), + focused: true, + events, + ..Default::default() + }; + let mut out = ctx.run_ui(raw, |ui| { + let rect = ui.max_rect(); + let resp = ui.interact(rect, ui.id().with("drag-zoom"), egui::Sense::click_and_drag()); + super::handle(&mut app, ui, rect, &resp, caps); + }); + out.textures_delta.clear(); + }; + let from = pos2(200.0, 300.0); + let to = from + vec2(0.0, dy); + frame(vec![Event::PointerMoved(from)]); + frame(vec![Event::PointerButton { pos: from, button, pressed: true, modifiers: mods }]); + frame(vec![Event::PointerMoved(to)]); + frame(vec![Event::PointerButton { pos: to, button, pressed: false, modifiers: mods }]); + frame(Vec::new()); + assert!(app.cam.is_valid()); + assert_ne!(app.cam.distance, before.distance, "the drag must zoom"); + // Creo zooms in on a downward drag by default; the preference reverses that too. + let default_zooms_out = if preset == "creo" { dy < 0.0 } else { dy > 0.0 }; + assert_eq!( + app.cam.distance > before.distance, + default_zooms_out != reverse, + "{preset} {button:?}, tool={tool}, {caps:?}, perspective={perspective}, reverse={reverse}, dy={dy}" + ); + assert_eq!(app.cam.target, before.target, "drag zoom keeps the view centre"); + assert_eq!((app.cam.yaw, app.cam.pitch, app.cam.roll, app.cam.fov), (before.yaw, before.pitch, before.roll, before.fov)); + } + } + } + } + } + } + #[test] fn wheel_zoom_speed_scales_each_step_on_every_canvas() { use egui::{Event, Modifiers, MouseWheelUnit, TouchPhase, pos2, vec2};