zoom rate preference

Author: Sidharth-Singh10

editor/src/messages/dialog/preferences_dialog/preferences_dialog_message_handler.rs

@@ -55,6 +55,27 @@ impl PreferencesDialogMessageHandler {
 			TextLabel::new("Zoom with Scroll").table_align(true).tooltip(zoom_with_scroll_tooltip).widget_holder(),
 		];
 
+		let zoom_rate_tooltip = "Adjust how fast zooming occurs when using the scroll wheel";
+		let zoom_rate = vec![
+			Separator::new(SeparatorType::Unrelated).widget_holder(),
+			TextLabel::new("Zoom Rate: ").table_align(true).tooltip(zoom_rate_tooltip).widget_holder(),
+			Separator::new(SeparatorType::Related).widget_holder(),
+			NumberInput::new(Some(map_zoom_rate_to_display(preferences.viewport_zoom_wheel_rate)))
+        .tooltip(zoom_rate_tooltip)
+        .min(1.0)
+        .max(100.0)
+        .display_decimal_places(0)  // Display as whole numbers
+        .on_update(|number_input: &NumberInput| {
+            if let Some(display_value) = number_input.value {
+                let actual_rate = map_display_to_zoom_rate(display_value);
+                PreferencesMessage::ViewportZoomWheelRate { rate: actual_rate }.into()
+            } else {
+                PreferencesMessage::ViewportZoomWheelRate { rate: (1. / 600.) * 3. }.into()
+            }
+        })
+        .widget_holder(),
+		];
+
 		// =======
 		// EDITING
 		// =======
@@ -184,6 +205,7 @@ impl PreferencesDialogMessageHandler {
 
 		Layout::WidgetLayout(WidgetLayout::new(vec![
 			LayoutGroup::Row { widgets: navigation_header },
+			LayoutGroup::Row { widgets: zoom_rate },
 			LayoutGroup::Row { widgets: zoom_with_scroll },
 			LayoutGroup::Row { widgets: editing_header },
 			LayoutGroup::Row { widgets: selection_label },
@@ -250,3 +272,41 @@ impl PreferencesDialogMessageHandler {
 		});
 	}
 }
+// Map the actual rate value to display value (1-100)
+fn map_zoom_rate_to_display(rate: f64) -> f64 {
+	let value = if rate <= 0.0001 {
+		1.0
+	} else if rate >= 0.05 {
+		100.0
+	} else {
+		// Calculate the logarithmic position between 0.0001 and 0.05
+		let log_min = 0.0001_f64.ln();
+		let log_max = 0.05_f64.ln();
+		let log_val = rate.ln();
+
+		// Map to 1-100 range
+		let normalized = (log_val - log_min) / (log_max - log_min);
+		1.0 + 99.0 * normalized
+	};
+
+	value.round()
+}
+
+// Map the display value (1-100) back to the actual rate value
+fn map_display_to_zoom_rate(display: f64) -> f64 {
+	if display <= 1.0 {
+		0.0001
+	} else if display >= 100.0 {
+		0.05
+	} else {
+		// Normalize to 0-1 range
+		let normalized = (display - 1.0) / 99.0;
+
+		let log_min = 0.0001_f64.ln();
+		let log_max = 0.05_f64.ln();
+		let log_val = log_min + normalized * (log_max - log_min);
+
+		// Convert back to actual value
+		log_val.exp()
+	}
+}

editor/src/messages/portfolio/document/document_message_handler.rs

@@ -192,6 +192,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
 					},
 					document_ptz: &mut self.document_ptz,
 					graph_view_overlay_open: self.graph_view_overlay_open,
+					preferences,
 				};
 
 				self.navigation_handler.process_message(message, responses, data);

editor/src/messages/portfolio/document/navigation/navigation_message_handler.rs

@@ -1,6 +1,6 @@
 use crate::consts::{
 	VIEWPORT_ROTATE_SNAP_INTERVAL, VIEWPORT_SCROLL_RATE, VIEWPORT_ZOOM_LEVELS, VIEWPORT_ZOOM_MIN_FRACTION_COVER, VIEWPORT_ZOOM_MOUSE_RATE, VIEWPORT_ZOOM_SCALE_MAX, VIEWPORT_ZOOM_SCALE_MIN,
-	VIEWPORT_ZOOM_TO_FIT_PADDING_SCALE_FACTOR, VIEWPORT_ZOOM_WHEEL_RATE,
+	VIEWPORT_ZOOM_TO_FIT_PADDING_SCALE_FACTOR,
 };
 use crate::messages::frontend::utility_types::MouseCursorIcon;
 use crate::messages::input_mapper::utility_types::input_keyboard::{Key, MouseMotion};
@@ -22,6 +22,7 @@ pub struct NavigationMessageData<'a> {
 	pub selection_bounds: Option<[DVec2; 2]>,
 	pub document_ptz: &'a mut PTZ,
 	pub graph_view_overlay_open: bool,
+	pub preferences: &'a PreferencesMessageHandler,
 }
 
 #[derive(Debug, Clone, PartialEq, Default)]
@@ -41,6 +42,7 @@ impl MessageHandler<NavigationMessage, NavigationMessageData<'_>> for Navigation
 			selection_bounds,
 			document_ptz,
 			graph_view_overlay_open,
+			preferences,
 		} = data;
 
 		fn get_ptz<'a>(document_ptz: &'a PTZ, network_interface: &'a NodeNetworkInterface, graph_view_overlay_open: bool, breadcrumb_network_path: &[NodeId]) -> Option<&'a PTZ> {
@@ -233,7 +235,8 @@ impl MessageHandler<NavigationMessage, NavigationMessageData<'_>> for Navigation
 			}
 			NavigationMessage::CanvasZoomMouseWheel => {
 				let scroll = ipp.mouse.scroll_delta.scroll_delta();
-				let mut zoom_factor = 1. + scroll.abs() * VIEWPORT_ZOOM_WHEEL_RATE;
+				log::info!("nagivationMessage rate: {}", preferences.viewport_zoom_wheel_rate);
+				let mut zoom_factor = 1. + scroll.abs() * preferences.viewport_zoom_wheel_rate;
 				if ipp.mouse.scroll_delta.y > 0. {
 					zoom_factor = 1. / zoom_factor
 				}

editor/src/messages/preferences/preferences_message.rs

@@ -15,6 +15,7 @@ pub enum PreferencesMessage {
 	VectorMeshes { enabled: bool },
 	ModifyLayout { zoom_with_scroll: bool },
 	GraphWireStyle { style: GraphWireStyle },
+	ViewportZoomWheelRate { rate: f64 },
 	// ImaginateRefreshFrequency { seconds: f64 },
 	// ImaginateServerHostname { hostname: String },
 }

editor/src/messages/preferences/preferences_message_handler.rs

@@ -14,6 +14,7 @@ pub struct PreferencesMessageHandler {
 	pub use_vello: bool,
 	pub vector_meshes: bool,
 	pub graph_wire_style: GraphWireStyle,
+	pub viewport_zoom_wheel_rate: f64,
 }
 
 impl PreferencesMessageHandler {
@@ -48,6 +49,7 @@ impl Default for PreferencesMessageHandler {
 			use_vello,
 			vector_meshes: false,
 			graph_wire_style: GraphWireStyle::default(),
+			viewport_zoom_wheel_rate: (1. / 600.) * 3.,
 		}
 	}
 }
@@ -103,6 +105,10 @@ impl MessageHandler<PreferencesMessage, ()> for PreferencesMessageHandler {
 				self.graph_wire_style = style;
 				responses.add(NodeGraphMessage::SendGraph);
 			}
+			PreferencesMessage::ViewportZoomWheelRate { rate } => {
+				log::info!("pref_mess_handler zRate: {}", rate);
+				self.viewport_zoom_wheel_rate = rate;
+			}
 		}
 		// TODO: Reenable when Imaginate is restored (and move back up one line since the auto-formatter doesn't like it in that block)
 		// PreferencesMessage::ImaginateRefreshFrequency { seconds } => {