Merge current main into wheel zoom smoothing option

crates/ui-egui/src/prefs.rs

@@ -58,6 +58,8 @@ pub struct Prefs {
     pub ui_scale: f32,
     /// The wheel zooms toward the point under the cursor (else toward the view's centre).
     pub zoom_to_cursor: bool,
+    /// Spread discrete wheel input across frames (off: apply each event immediately).
+    pub smooth_wheel_zoom: bool,
     /// View changes (axis view, Look At, Home) animate; `look_at_speed` scales how fast.
     pub look_at_anim: bool,
     pub look_at_speed: f32,
@@ -84,6 +86,7 @@ impl Default for Prefs {
             language: "en".into(),
             ui_scale: 1.0,
             zoom_to_cursor: true,
+            smooth_wheel_zoom: true,
             look_at_anim: true,
             look_at_speed: 1.0,
             up_axis: "z".into(),
@@ -184,6 +187,7 @@ fn defaults(app: &mut SolveApp, page: usize) {
             p.radial_context_menu = d.radial_context_menu;
             p.zoom_reverse = d.zoom_reverse;
             p.zoom_to_cursor = d.zoom_to_cursor;
+            p.smooth_wheel_zoom = d.smooth_wheel_zoom;
             p.orbit_cursor = d.orbit_cursor;
             p.space_mouse_enabled = d.space_mouse_enabled;
             p.space_mouse_speed = d.space_mouse_speed;
@@ -577,6 +581,10 @@ fn page(app: &mut SolveApp, ui: &mut egui::Ui, t: &Tokens) {
             ui.checkbox(&mut app.preferences.zoom_to_cursor, "")
                 .on_hover_text("The wheel zooms toward the point under the cursor (off: toward the view's centre)");
             ui.end_row();
+            ui.label("Smooth wheel zoom");
+            ui.checkbox(&mut app.preferences.smooth_wheel_zoom, "")
+                .on_hover_text("Turn off to apply each wheel event immediately, without a smoothing tail");
+            ui.end_row();
             ui.label("Orbit around");
             ui.horizontal(|ui| {
                 ui.radio_value(&mut app.preferences.orbit_cursor, false, "View centre");
@@ -782,6 +790,26 @@ mod tests {
         assert!(h.app.preferences.radial_context_menu, "Cancel restores the last Apply");
     }
 
+    #[test]
+    fn wheel_smoothing_persists_and_follows_dialog_buttons() {
+        assert!(serde_json::from_value::<Prefs>(json!({})).unwrap().smooth_wheel_zoom);
+        let mut app = SolveApp::new(solvecraft_engine::Session::default(), Default::default());
+        control(&mut app, &json!({"open":"Navigation", "smooth_wheel_zoom":false})).unwrap();
+        control(&mut app, &json!({"button":"cancel"})).unwrap();
+        assert!(app.preferences.smooth_wheel_zoom);
+        control(&mut app, &json!({"open":"Navigation", "smooth_wheel_zoom":false})).unwrap();
+        control(&mut app, &json!({"button":"apply"})).unwrap();
+        control(&mut app, &json!({"smooth_wheel_zoom":true, "button":"cancel"})).unwrap();
+        assert!(!app.preferences.smooth_wheel_zoom);
+        let mut other = SolveApp::new(solvecraft_engine::Session::default(), Default::default());
+        other.load_prefs(&app.prefs());
+        assert!(!other.preferences.smooth_wheel_zoom);
+        control(&mut app, &json!({"open":"Navigation", "button":"defaults"})).unwrap();
+        assert!(app.preferences.smooth_wheel_zoom);
+        control(&mut app, &json!({"button":"cancel"})).unwrap();
+        assert!(!app.preferences.smooth_wheel_zoom);
+    }
+
     #[test]
     fn presets_map_the_mouse_and_prefs_round_trip() {
         let mut app = SolveApp::new(solvecraft_engine::Session::default(), Default::default());