Rename the message handlers of all the tools to use the MessageHandler suffix

editor/src/messages/tool/tool_messages/artboard_tool.rs

@@ -14,7 +14,7 @@ use graph_craft::document::NodeId;
 use graphene_std::renderer::Quad;
 
 #[derive(Default, ExtractField)]
-pub struct ArtboardTool {
+pub struct ArtboardToolMessageHandler {
 	fsm_state: ArtboardToolFsmState,
 	data: ArtboardToolData,
 }
@@ -36,7 +36,7 @@ pub enum ArtboardToolMessage {
 	PointerUp,
 }
 
-impl ToolMetadata for ArtboardTool {
+impl ToolMetadata for ArtboardToolMessageHandler {
 	fn icon_name(&self) -> String {
 		"GeneralArtboardTool".into()
 	}
@@ -49,7 +49,7 @@ impl ToolMetadata for ArtboardTool {
 }
 
 #[message_handler_data]
-impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for ArtboardTool {
+impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for ArtboardToolMessageHandler {
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
 		self.fsm_state.process_event(message, &mut self.data, context, &(), responses, false);
 	}
@@ -71,13 +71,13 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Artb
 	}
 }
 
-impl LayoutHolder for ArtboardTool {
+impl LayoutHolder for ArtboardToolMessageHandler {
 	fn layout(&self) -> Layout {
 		Layout::WidgetLayout(WidgetLayout::default())
 	}
 }
 
-impl ToolTransition for ArtboardTool {
+impl ToolTransition for ArtboardToolMessageHandler {
 	fn event_to_message_map(&self) -> EventToMessageMap {
 		EventToMessageMap {
 			tool_abort: Some(ArtboardToolMessage::Abort.into()),

editor/src/messages/tool/tool_messages/brush_tool.rs

@@ -21,7 +21,7 @@ pub enum DrawMode {
 }
 
 #[derive(Default, ExtractField)]
-pub struct BrushTool {
+pub struct BrushToolMessageHandler {
 	fsm_state: BrushToolFsmState,
 	data: BrushToolData,
 	options: BrushOptions,
@@ -89,7 +89,7 @@ enum BrushToolFsmState {
 	Drawing,
 }
 
-impl ToolMetadata for BrushTool {
+impl ToolMetadata for BrushToolMessageHandler {
 	fn icon_name(&self) -> String {
 		"RasterBrushTool".into()
 	}
@@ -101,7 +101,7 @@ impl ToolMetadata for BrushTool {
 	}
 }
 
-impl LayoutHolder for BrushTool {
+impl LayoutHolder for BrushToolMessageHandler {
 	fn layout(&self) -> Layout {
 		let mut widgets = vec![
 			NumberInput::new(Some(self.options.diameter))
@@ -186,7 +186,7 @@ impl LayoutHolder for BrushTool {
 }
 
 #[message_handler_data]
-impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for BrushTool {
+impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for BrushToolMessageHandler {
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
 		let ToolMessage::Brush(BrushToolMessage::UpdateOptions(action)) = message else {
 			self.fsm_state.process_event(message, &mut self.data, context, &self.options, responses, true);
@@ -243,7 +243,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Brus
 	}
 }
 
-impl ToolTransition for BrushTool {
+impl ToolTransition for BrushToolMessageHandler {
 	fn event_to_message_map(&self) -> EventToMessageMap {
 		EventToMessageMap {
 			tool_abort: Some(BrushToolMessage::Abort.into()),

editor/src/messages/tool/tool_messages/eyedropper_tool.rs

@@ -2,7 +2,7 @@ use super::tool_prelude::*;
 use crate::messages::tool::utility_types::DocumentToolData;
 
 #[derive(Default, ExtractField)]
-pub struct EyedropperTool {
+pub struct EyedropperToolMessageHandler {
 	fsm_state: EyedropperToolFsmState,
 	data: EyedropperToolData,
 }
@@ -21,7 +21,7 @@ pub enum EyedropperToolMessage {
 	SampleSecondaryColorEnd,
 }
 
-impl ToolMetadata for EyedropperTool {
+impl ToolMetadata for EyedropperToolMessageHandler {
 	fn icon_name(&self) -> String {
 		"GeneralEyedropperTool".into()
 	}
@@ -33,14 +33,14 @@ impl ToolMetadata for EyedropperTool {
 	}
 }
 
-impl LayoutHolder for EyedropperTool {
+impl LayoutHolder for EyedropperToolMessageHandler {
 	fn layout(&self) -> Layout {
 		Layout::WidgetLayout(WidgetLayout::default())
 	}
 }
 
 #[message_handler_data]
-impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for EyedropperTool {
+impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for EyedropperToolMessageHandler {
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
 		self.fsm_state.process_event(message, &mut self.data, context, &(), responses, true);
 	}
@@ -55,7 +55,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Eyed
 	);
 }
 
-impl ToolTransition for EyedropperTool {
+impl ToolTransition for EyedropperToolMessageHandler {
 	fn event_to_message_map(&self) -> EventToMessageMap {
 		EventToMessageMap {
 			tool_abort: Some(EyedropperToolMessage::Abort.into()),

editor/src/messages/tool/tool_messages/fill_tool.rs

@@ -4,7 +4,7 @@ use crate::messages::tool::common_functionality::graph_modification_utils::NodeG
 use graphene_std::vector::style::Fill;
 
 #[derive(Default, ExtractField)]
-pub struct FillTool {
+pub struct FillToolMessageHandler {
 	fsm_state: FillToolFsmState,
 }
 
@@ -23,7 +23,7 @@ pub enum FillToolMessage {
 	FillSecondaryColor,
 }
 
-impl ToolMetadata for FillTool {
+impl ToolMetadata for FillToolMessageHandler {
 	fn icon_name(&self) -> String {
 		"GeneralFillTool".into()
 	}
@@ -35,14 +35,14 @@ impl ToolMetadata for FillTool {
 	}
 }
 
-impl LayoutHolder for FillTool {
+impl LayoutHolder for FillToolMessageHandler {
 	fn layout(&self) -> Layout {
 		Layout::WidgetLayout(WidgetLayout::default())
 	}
 }
 
 #[message_handler_data]
-impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for FillTool {
+impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for FillToolMessageHandler {
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
 		self.fsm_state.process_event(message, &mut (), context, &(), responses, true);
 	}
@@ -62,7 +62,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Fill
 	}
 }
 
-impl ToolTransition for FillTool {
+impl ToolTransition for FillToolMessageHandler {
 	fn event_to_message_map(&self) -> EventToMessageMap {
 		EventToMessageMap {
 			tool_abort: Some(FillToolMessage::Abort.into()),

editor/src/messages/tool/tool_messages/freehand_tool.rs

@@ -14,7 +14,7 @@ use graphene_std::vector::VectorModificationType;
 use graphene_std::vector::{PointId, SegmentId};
 
 #[derive(Default, ExtractField)]
-pub struct FreehandTool {
+pub struct FreehandToolMessageHandler {
 	fsm_state: FreehandToolFsmState,
 	data: FreehandToolData,
 	options: FreehandOptions,
@@ -68,7 +68,7 @@ enum FreehandToolFsmState {
 	Drawing,
 }
 
-impl ToolMetadata for FreehandTool {
+impl ToolMetadata for FreehandToolMessageHandler {
 	fn icon_name(&self) -> String {
 		"VectorFreehandTool".into()
 	}
@@ -90,7 +90,7 @@ fn create_weight_widget(line_weight: f64) -> WidgetHolder {
 		.widget_holder()
 }
 
-impl LayoutHolder for FreehandTool {
+impl LayoutHolder for FreehandToolMessageHandler {
 	fn layout(&self) -> Layout {
 		let mut widgets = self.options.fill.create_widgets(
 			"Fill",
@@ -117,7 +117,7 @@ impl LayoutHolder for FreehandTool {
 }
 
 #[message_handler_data]
-impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for FreehandTool {
+impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for FreehandToolMessageHandler {
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
 		let ToolMessage::Freehand(FreehandToolMessage::UpdateOptions(action)) = message else {
 			self.fsm_state.process_event(message, &mut self.data, context, &self.options, responses, true);
@@ -161,7 +161,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Free
 	}
 }
 
-impl ToolTransition for FreehandTool {
+impl ToolTransition for FreehandToolMessageHandler {
 	fn event_to_message_map(&self) -> EventToMessageMap {
 		EventToMessageMap {
 			overlay_provider: Some(|overlay_context: OverlayContext| FreehandToolMessage::Overlays(overlay_context).into()),

editor/src/messages/tool/tool_messages/gradient_tool.rs

@@ -8,7 +8,7 @@ use crate::messages::tool::common_functionality::snapping::SnapManager;
 use graphene_std::vector::style::{Fill, Gradient, GradientType};
 
 #[derive(Default, ExtractField)]
-pub struct GradientTool {
+pub struct GradientToolMessageHandler {
 	fsm_state: GradientToolFsmState,
 	data: GradientToolData,
 	options: GradientOptions,
@@ -41,7 +41,7 @@ pub enum GradientOptionsUpdate {
 	Type(GradientType),
 }
 
-impl ToolMetadata for GradientTool {
+impl ToolMetadata for GradientToolMessageHandler {
 	fn icon_name(&self) -> String {
 		"GeneralGradientTool".into()
 	}
@@ -54,7 +54,7 @@ impl ToolMetadata for GradientTool {
 }
 
 #[message_handler_data]
-impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for GradientTool {
+impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for GradientToolMessageHandler {
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
 		let ToolMessage::Gradient(GradientToolMessage::UpdateOptions(action)) = message else {
 			self.fsm_state.process_event(message, &mut self.data, context, &self.options, responses, false);
@@ -88,7 +88,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Grad
 	);
 }
 
-impl LayoutHolder for GradientTool {
+impl LayoutHolder for GradientToolMessageHandler {
 	fn layout(&self) -> Layout {
 		let gradient_type = RadioInput::new(vec![
 			RadioEntryData::new("Linear")
@@ -214,14 +214,14 @@ impl SelectedGradient {
 	}
 }
 
-impl GradientTool {
+impl GradientToolMessageHandler {
 	/// Get the gradient type of the selected gradient (if it exists)
 	pub fn selected_gradient(&self) -> Option<GradientType> {
 		self.data.selected_gradient.as_ref().map(|selected| selected.gradient.gradient_type)
 	}
 }
 
-impl ToolTransition for GradientTool {
+impl ToolTransition for GradientToolMessageHandler {
 	fn event_to_message_map(&self) -> EventToMessageMap {
 		EventToMessageMap {
 			tool_abort: Some(GradientToolMessage::Abort.into()),

editor/src/messages/tool/tool_messages/navigate_tool.rs

@@ -1,7 +1,7 @@
 use super::tool_prelude::*;
 
 #[derive(Default, ExtractField)]
-pub struct NavigateTool {
+pub struct NavigateToolMessageHandler {
 	fsm_state: NavigateToolFsmState,
 	tool_data: NavigateToolData,
 }
@@ -20,7 +20,7 @@ pub enum NavigateToolMessage {
 	End,
 }
 
-impl ToolMetadata for NavigateTool {
+impl ToolMetadata for NavigateToolMessageHandler {
 	fn icon_name(&self) -> String {
 		"GeneralNavigateTool".into()
 	}
@@ -32,14 +32,14 @@ impl ToolMetadata for NavigateTool {
 	}
 }
 
-impl LayoutHolder for NavigateTool {
+impl LayoutHolder for NavigateToolMessageHandler {
 	fn layout(&self) -> Layout {
 		Layout::WidgetLayout(WidgetLayout::default())
 	}
 }
 
 #[message_handler_data]
-impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for NavigateTool {
+impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for NavigateToolMessageHandler {
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
 		self.fsm_state.process_event(message, &mut self.tool_data, context, &(), responses, true);
 	}
@@ -61,7 +61,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Navi
 	}
 }
 
-impl ToolTransition for NavigateTool {
+impl ToolTransition for NavigateToolMessageHandler {
 	fn event_to_message_map(&self) -> EventToMessageMap {
 		EventToMessageMap {
 			tool_abort: Some(NavigateToolMessage::Abort.into()),

editor/src/messages/tool/tool_messages/path_tool.rs

@@ -26,7 +26,7 @@ use graphene_std::vector::{ManipulatorPointId, PointId, VectorModificationType};
 use std::vec;
 
 #[derive(Default, ExtractField)]
-pub struct PathTool {
+pub struct PathToolMessageHandler {
 	fsm_state: PathToolFsmState,
 	tool_data: PathToolData,
 	options: PathToolOptions,
@@ -152,7 +152,7 @@ pub enum PathOptionsUpdate {
 	TogglePivotPinned,
 }
 
-impl ToolMetadata for PathTool {
+impl ToolMetadata for PathToolMessageHandler {
 	fn icon_name(&self) -> String {
 		"VectorPathTool".into()
 	}
@@ -164,7 +164,7 @@ impl ToolMetadata for PathTool {
 	}
 }
 
-impl LayoutHolder for PathTool {
+impl LayoutHolder for PathToolMessageHandler {
 	fn layout(&self) -> Layout {
 		let coordinates = self.tool_data.selection_status.as_one().as_ref().map(|point| point.coordinates);
 		let (x, y) = coordinates.map(|point| (Some(point.x), Some(point.y))).unwrap_or((None, None));
@@ -307,7 +307,7 @@ impl LayoutHolder for PathTool {
 }
 
 #[message_handler_data]
-impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for PathTool {
+impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for PathToolMessageHandler {
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
 		let updating_point = message == ToolMessage::Path(PathToolMessage::SelectedPointUpdated);
 
@@ -421,7 +421,7 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Path
 	}
 }
 
-impl ToolTransition for PathTool {
+impl ToolTransition for PathToolMessageHandler {
 	fn event_to_message_map(&self) -> EventToMessageMap {
 		EventToMessageMap {
 			tool_abort: Some(PathToolMessage::Abort.into()),