Code review

Author: Keavon

editor/src/messages/tool/common_functionality/graph_modification_utils.rs

@@ -86,7 +86,7 @@ pub fn merge_layers(document: &DocumentMessageHandler, first_layer: LayerNodeIde
 		downstream_input: InputConnector::node(second_layer.to_node(), 1),
 		input_connector: InputConnector::node(merge_node_id, 1),
 	});
-	// Delete the second layer layer node without deleting it's children nodes.
+	// We delete the second layer node without deleting its child nodes
 	responses.add(NodeGraphMessage::DeleteNodes {
 		node_ids: vec![second_layer.to_node()],
 		delete_children: false,

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

@@ -16,14 +16,12 @@ use graph_craft::document::{NodeId, NodeInput};
 use graphene_core::Color;
 use graphene_core::vector::{PointId, VectorModificationType};
 use graphene_std::vector::{HandleId, ManipulatorPointId, NoHashBuilder, SegmentId, VectorData};
-
+use spline_mode::*;
 use std::fmt;
 
-// TODO: refactor the code into new module for drawing a Path.
+// TODO: Refactor the code into new module for drawing a path
 mod spline_mode;
 
-use spline_mode::*;
-
 #[derive(Default)]
 pub struct PenTool {
 	fsm_state: PenToolFsmState,
@@ -100,7 +98,7 @@ pub enum PenToolMessage {
 	FinalPosition {
 		final_position: DVec2,
 	},
-	// Specific to the Spline mode.
+	/// Specific to spline mode.
 	SplineMergeEndpoints,
 	SwapHandles,
 }
@@ -147,7 +145,7 @@ impl PenTool {
 
 		DropdownInput::new(vec![tool_mode_entries])
 			.selected_index(Some((self.options.tool_mode) as u32))
-			.tooltip("Select Spline to draw smooth curves or select Path to draw a path.")
+			.tooltip(format!("Path Mode:\n\n{}\n{}", ToolMode::Path.description(), ToolMode::Spline.description()))
 			.widget_holder()
 	}
 }
@@ -352,6 +350,16 @@ impl fmt::Display for ToolMode {
 		}
 	}
 }
+
+impl ToolMode {
+	fn description(&self) -> &'static str {
+		match self {
+			ToolMode::Path => "Path mode is the standard Pen tool behavior for drawing Bézier paths.",
+			ToolMode::Spline => "Spline mode is for placing the control points of a spline curve.",
+		}
+	}
+}
+
 /// The type of handle which is dragged by the cursor (under the cursor).
 ///
 /// ![Terminology](https://files.keavon.com/-/EachNotedLovebird/capture.png)

frontend/assets/icon-24px-two-tone/vector-spline-tool.svg

@@ -381,7 +381,6 @@ import VectorPathTool from "@graphite-frontend/assets/icon-24px-two-tone/vector-
 import VectorPenTool from "@graphite-frontend/assets/icon-24px-two-tone/vector-pen-tool.svg";
 import VectorPolygonTool from "@graphite-frontend/assets/icon-24px-two-tone/vector-polygon-tool.svg";
 import VectorRectangleTool from "@graphite-frontend/assets/icon-24px-two-tone/vector-rectangle-tool.svg";
-import VectorSplineTool from "@graphite-frontend/assets/icon-24px-two-tone/vector-spline-tool.svg";
 import VectorTextTool from "@graphite-frontend/assets/icon-24px-two-tone/vector-text-tool.svg";
 
 const TWO_TONE_24PX = {
@@ -405,7 +404,6 @@ const TWO_TONE_24PX = {
 	VectorPenTool: { svg: VectorPenTool, size: 24 },
 	VectorRectangleTool: { svg: VectorRectangleTool, size: 24 },
 	VectorPolygonTool: { svg: VectorPolygonTool, size: 24 },
-	VectorSplineTool: { svg: VectorSplineTool, size: 24 },
 	VectorTextTool: { svg: VectorTextTool, size: 24 },
 } as const;