From 8a888ff0f3d04f4d093eba373f2a8579904a1c72 Mon Sep 17 00:00:00 2001 From: raykholo Date: Thu, 29 Oct 2026 15:26:14 +0000 Subject: [PATCH] Preferences: mouse-wheel zoom speed (#4176) (#4179) * claim: #4176 * Preferences: mouse-wheel zoom speed (#4176) A 0.25x to 4x multiplier for each wheel zoom step, applied in navigation::handle so every canvas uses it. The 3D mouse keeps its own speed. Values outside the range are refused when set and reset to 1x when loaded. * Control protocol: wheel_zoom_speed in the sorted ui.prefs list (#4176) * Wheel zoom speed: its label in the complete catalogs (#4176) --- assets/locales/pending/wheel-zoom-speed.json | 23 ++++++ crates/ui-egui/src/navigation.rs | 82 +++++++++++++++++++- crates/ui-egui/src/prefs.rs | 11 ++- crates/ui-egui/src/prefs/navigation.rs | 1 + docs/control-protocol.md | 1 + 5 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 assets/locales/pending/wheel-zoom-speed.json diff --git a/assets/locales/pending/wheel-zoom-speed.json b/assets/locales/pending/wheel-zoom-speed.json new file mode 100644 index 000000000..caa7ff802 --- /dev/null +++ b/assets/locales/pending/wheel-zoom-speed.json @@ -0,0 +1,23 @@ +{ + "en": { + "ui.wheel_zoom_speed": "Mouse wheel zoom speed" + }, + "ar": { + "ui.wheel_zoom_speed": "سرعة التكبير بعجلة الفأرة" + }, + "de": { + "ui.wheel_zoom_speed": "Zoomgeschwindigkeit des Mausrads" + }, + "he": { + "ui.wheel_zoom_speed": "מהירות זום בגלגלת העכבר" + }, + "ja": { + "ui.wheel_zoom_speed": "マウスホイールのズーム速度" + }, + "vi": { + "ui.wheel_zoom_speed": "Tốc độ thu phóng bằng con lăn chuột" + }, + "zh": { + "ui.wheel_zoom_speed": "鼠标滚轮缩放速度" + } +} diff --git a/crates/ui-egui/src/navigation.rs b/crates/ui-egui/src/navigation.rs index f4cc452f9..656647fe5 100644 --- a/crates/ui-egui/src/navigation.rs +++ b/crates/ui-egui/src/navigation.rs @@ -595,7 +595,7 @@ pub(crate) fn handle(app: &mut SolveApp, ui: &mut egui::Ui, rect: Rect, resp: &e } if inside && scroll.is_finite() && scroll != 0.0 { app.viewport.orbit_free = None; - let f = (-scroll as f64 * 0.0015 * crate::prefs::zoom_sign(app)).exp(); + let f = (-scroll as f64 * 0.0015 * f64::from(app.preferences.wheel_zoom_speed) * crate::prefs::zoom_sign(app)).exp(); let anchor = zoom_anchor(app, rect, hover, caps.orbit); if app.preferences.nav == crate::prefs::TOUCHPAD_NAV { let mut params = json!({"motion":"zoom", "factor":f.clamp(0.05,20.0)}); @@ -1703,6 +1703,86 @@ mod tests { assert!(offenders.is_empty(), "camera input outside navigation::handle; call it instead:\n{}", offenders.join("\n")); } + #[test] + fn wheel_zoom_speed_scales_each_step_on_every_canvas() { + use egui::{Event, Modifiers, MouseWheelUnit, TouchPhase, pos2, vec2}; + use serde_json::json; + + for caps in [super::NavCaps::MODEL, super::NavCaps::RENDER, super::NavCaps { orbit: false, pick: false }] { + for speed in [None, Some(0.25), Some(1.0), Some(4.0)] { + for reverse in [false, true] { + let mut app = crate::SolveApp::new(solidcraft_engine::Session::default(), crate::Services::default()); + crate::prefs::set(&mut app, &json!({"smooth_wheel_zoom":false, "zoom_to_cursor":false, "zoom_reverse":reverse})).unwrap(); + if let Some(speed) = speed { + crate::prefs::set(&mut app, &json!({"wheel_zoom_speed":speed})).unwrap(); + } + let ctx = crate::fonts::test_context(); + let mut frame = |events| { + 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("wheel-speed"), egui::Sense::click_and_drag()); + super::handle(&mut app, ui, rect, &resp, caps); + }); + out.textures_delta.clear(); + }; + frame(vec![Event::PointerMoved(pos2(200.0, 300.0))]); + frame(vec![Event::MouseWheel { + unit: MouseWheelUnit::Point, + delta: vec2(0.0, 40.0), + modifiers: Modifiers::NONE, + phase: TouchPhase::Move, + }]); + let expected = (-40.0_f64 * 0.0015 * speed.unwrap_or(1.0) * if reverse { -1.0 } else { 1.0 }).exp(); + let default_distance = super::Camera::default().distance; + assert!((app.cam.distance / default_distance - expected).abs() < 1e-6, "{caps:?}, {speed:?}, reverse={reverse}"); + } + } + } + } + + #[test] + fn wheel_zoom_speed_persists_defaults_and_rejects_invalid_values() { + use serde_json::json; + let mut app = crate::SolveApp::new(solidcraft_engine::Session::default(), crate::Services::default()); + let old = crate::prefs::lenient(&json!({"zoom_reverse":true})); + assert_eq!(serde_json::to_value(old).unwrap()["wheel_zoom_speed"], 1.0); + crate::prefs::control(&mut app, &json!({"open":"Navigation", "wheel_zoom_speed":2.5, "button":"apply"})).unwrap(); + let saved = serde_json::to_value(&app.preferences).unwrap(); + assert_eq!(serde_json::to_value(crate::prefs::lenient(&saved)).unwrap()["wheel_zoom_speed"], 2.5); + for invalid in [0.0, 0.24, 4.01, 1e30] { + assert!(crate::prefs::set(&mut app, &json!({"wheel_zoom_speed":invalid})).is_err()); + let loaded = crate::prefs::lenient(&json!({"wheel_zoom_speed":invalid, "zoom_reverse":true})); + assert_eq!(serde_json::to_value(&loaded).unwrap()["wheel_zoom_speed"], 1.0); + assert!(loaded.zoom_reverse); + } + crate::prefs::control(&mut app, &json!({"button":"defaults"})).unwrap(); + assert_eq!(serde_json::to_value(&app.preferences).unwrap()["wheel_zoom_speed"], 1.0); + crate::prefs::control(&mut app, &json!({"button":"cancel"})).unwrap(); + assert_eq!(serde_json::to_value(&app.preferences).unwrap()["wheel_zoom_speed"], 2.5); + } + + #[test] + fn wheel_zoom_speed_does_not_change_3d_mouse_zoom() { + use crate::space_mouse::{DeviceMotion, Motion}; + let mut distances = Vec::new(); + for speed in [0.25, 1.0, 4.0] { + let mut app = crate::SolveApp::new(solidcraft_engine::Session::default(), crate::Services::default()); + crate::prefs::set(&mut app, &serde_json::json!({"wheel_zoom_speed":speed})).unwrap(); + let before = app.cam.distance; + app.viewport.device_motion = Some(DeviceMotion { motion: Motion { translation: [0.0, 1.0, 0.0], rotation: [0.0; 3] }, seconds: 0.05 }); + super::device(&mut app, egui::Rect::from_min_size(egui::Pos2::ZERO, egui::vec2(800.0, 600.0)), super::NavCaps::MODEL); + assert!(app.cam.distance < before); + distances.push(app.cam.distance); + } + assert!(distances.windows(2).all(|pair| pair[0] == pair[1])); + } + /// A flat page (orbit off) pans and zooms with the same bindings and never turns the view. #[test] fn flat_pages_pan_and_zoom_with_the_same_bindings_but_never_orbit() { diff --git a/crates/ui-egui/src/prefs.rs b/crates/ui-egui/src/prefs.rs index e0f01a892..fbbf540c5 100644 --- a/crates/ui-egui/src/prefs.rs +++ b/crates/ui-egui/src/prefs.rs @@ -1082,6 +1082,8 @@ preference_settings! { browser_bodies_folders: BodiesFolders = BodiesFolders::Several, PAGE_INTERFACE; /// The wheel zooms toward the point under the cursor (else toward the view's centre). zoom_to_cursor: bool = true, PAGE_NAVIGATION => check("Zoom to the cursor", "The wheel zooms toward the point under the cursor (off: toward the view's centre)"); + /// Speed multiplier for wheel zoom, independent of the 3D mouse. + wheel_zoom_speed: f32 = 1.0, PAGE_NAVIGATION, accept(0.25..=4.0) => slider("ui.wheel_zoom_speed", 0.25..=4.0, 0.05, |v| format!("{v:.2}×"), "prefs:wheel_zoom_speed"); /// Spread discrete wheel input across frames (off: apply each event immediately). smooth_wheel_zoom: bool = true, PAGE_NAVIGATION => check("Smooth wheel zoom", "Turn off to apply each wheel event immediately, without a smoothing tail"); /// Two-finger trackpad scroll pans (off: it zooms like the wheel); pinch always zooms. @@ -3081,6 +3083,9 @@ pub fn migrate(mut p: Prefs) -> Prefs { if !p.joint_rotation_fine.is_finite() || !(0.001..=180.0).contains(&p.joint_rotation_fine) { p.joint_rotation_fine = 0.1; } + if !accepted::wheel_zoom_speed(&p) { + p.wheel_zoom_speed = Prefs::default().wheel_zoom_speed; + } if p.orbit_cursor { p.orbit_around = OrbitAround::Cursor; p.orbit_cursor = false; @@ -3191,7 +3196,11 @@ pub fn set(app: &mut SolveApp, p: &serde_json::Value) -> Result