adapted to the RadioEntryData

Author: Pratik Agrawal

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

@@ -1,4 +1,6 @@
-use crate::messages::layout::utility_types::widget_prelude::*;
+use std::sync::Arc;
+
+use crate::messages::layout::utility_types::{layout_widget, widget_prelude::*};
 use crate::messages::preferences::SelectionMode;
 use crate::messages::prelude::*;
 
@@ -63,42 +65,40 @@ impl PreferencesDialogMessageHandler {
 				.widget_holder(),
 		];
 
-		let selection_mode_tooltip = "Choose the selection mode for objects in the editor";
-
-		let selection_mode_checkboxes = vec![
-			CheckboxInput::new(matches!(preferences.selection_mode, SelectionMode::Touched))
+		let selection_section = vec![TextLabel::new("Selection Mode").italic(true).widget_holder()];
+		let selection_mode = RadioInput::new(vec![
+			RadioEntryData::new("touched")
+				.label("Touched")
 				.tooltip("Select objects that are touched by the selection area")
-				.on_update(|_| {
+				.on_update(move |_| {
 					PreferencesMessage::SelectionMode {
 						selection_mode: SelectionMode::Touched,
 					}
 					.into()
-				})
-				.widget_holder(),
-			TextLabel::new("Touched").table_align(true).widget_holder(),
-			Separator::new(SeparatorType::Unrelated).widget_holder(),
-			CheckboxInput::new(matches!(preferences.selection_mode, SelectionMode::Contained))
+				}),
+			RadioEntryData::new("contained")
+				.label("Contained")
 				.tooltip("Select objects that are fully contained within the selection area")
-				.on_update(|_| {
+				.on_update(move |_| {
 					PreferencesMessage::SelectionMode {
 						selection_mode: SelectionMode::Contained,
 					}
 					.into()
-				})
-				.widget_holder(),
-			TextLabel::new("Contained").table_align(true).widget_holder(),
-			Separator::new(SeparatorType::Unrelated).widget_holder(),
-			CheckboxInput::new(matches!(preferences.selection_mode, SelectionMode::ByDragDirection))
+				}),
+			RadioEntryData::new("by_drag_direction")
+				.label("By Drag Direction")
 				.tooltip("Select objects based on the drag direction of the selection area")
-				.on_update(|_| {
+				.on_update(move |_| {
 					PreferencesMessage::SelectionMode {
 						selection_mode: SelectionMode::ByDragDirection,
 					}
 					.into()
-				})
-				.widget_holder(),
-			TextLabel::new("By Drag Direction").table_align(true).widget_holder(),
-		];
+				}),
+		])
+		.selected_index(Some(
+			(preferences.selection_mode == SelectionMode::ByDragDirection) as u32, // Accessing selection_mode correctly
+		))
+		.widget_holder();
 
 		// TODO: Reenable when Imaginate is restored
 		// let imaginate_server_hostname = vec![
@@ -128,10 +128,8 @@ impl PreferencesDialogMessageHandler {
 			LayoutGroup::Row { widgets: zoom_with_scroll },
 			LayoutGroup::Row { widgets: renderer_section },
 			LayoutGroup::Row { widgets: use_vello },
-			LayoutGroup::Row {
-				widgets: vec![TextLabel::new("Selection Mode").italic(true).widget_holder()],
-			},
-			LayoutGroup::Row { widgets: selection_mode_checkboxes },
+			LayoutGroup::Row { widgets: selection_section },
+			LayoutGroup::Row { widgets: vec![selection_mode] },
 			// LayoutGroup::Row { widgets: imaginate_server_hostname },
 			// LayoutGroup::Row { widgets: imaginate_refresh_frequency },
 		]))

editor/src/messages/preferences/preferences_message_handler.rs

@@ -101,9 +101,11 @@ impl MessageHandler<PreferencesMessage, ()> for PreferencesMessageHandler {
 				responses.add(KeyMappingMessage::ModifyMapping(variant));
 				responses.add(FrontendMessage::UpdateZoomWithScroll { zoom_with_scroll });
 			}
-			PreferencesMessage::SelectionMode { selection_mode } => todo!(),
+			PreferencesMessage::SelectionMode { selection_mode } => {
+				log::info!("Setting selection mode: {:?}", selection_mode);
+				self.selection_mode = selection_mode;
+			}
 		}
-
 		responses.add(FrontendMessage::TriggerSavePreferences { preferences: self.clone() });
 	}