Improve the node graph with revamped top bar and disabling tools when graph is open (#2093)

* Add "Fade Artwork" slider and disable tools when graph is open

* Add navigation and layer/node management buttons to graph top bar

* Reduce code duplication

editor/src/messages/tool/tool_message_handler.rs

@@ -25,6 +25,7 @@ pub struct ToolMessageHandler {
 	pub tool_state: ToolFsmState,
 	pub transform_layer_handler: TransformLayerMessageHandler,
 	pub shape_editor: ShapeState,
+	pub tool_is_active: bool,
 }
 
 impl MessageHandler<ToolMessage, ToolMessageData<'_>> for ToolMessageHandler {
@@ -69,9 +70,10 @@ impl MessageHandler<ToolMessage, ToolMessageData<'_>> for ToolMessageHandler {
 				let old_tool = tool_data.active_tool_type;
 
 				// Do nothing if switching to the same tool
-				if tool_type == old_tool {
+				if self.tool_is_active && tool_type == old_tool {
 					return;
 				}
+				self.tool_is_active = true;
 
 				// Send the old and new tools a transition to their FSM Abort states
 				let mut send_abort_to_tool = |tool_type, update_hints_and_cursor: bool| {
@@ -85,6 +87,7 @@ impl MessageHandler<ToolMessage, ToolMessageData<'_>> for ToolMessageHandler {
 							shape_editor: &mut self.shape_editor,
 							node_graph,
 						};
+
 						if let Some(tool_abort_message) = tool.event_to_message_map().tool_abort {
 							tool.process_message(tool_abort_message, responses, &mut data);
 						}
@@ -133,6 +136,11 @@ impl MessageHandler<ToolMessage, ToolMessageData<'_>> for ToolMessageHandler {
 				responses.add(BroadcastMessage::UnsubscribeEvent { message, on });
 
 				responses.add(OverlaysMessage::RemoveProvider(ARTBOARD_OVERLAY_PROVIDER));
+
+				responses.add(FrontendMessage::UpdateInputHints { hint_data: Default::default() });
+				responses.add(FrontendMessage::UpdateMouseCursor { cursor: Default::default() });
+
+				self.tool_is_active = false;
 			}
 			ToolMessage::InitTools => {
 				// Subscribe the transform layer to selection change events
@@ -141,6 +149,8 @@ impl MessageHandler<ToolMessage, ToolMessageData<'_>> for ToolMessageHandler {
 					send: Box::new(TransformLayerMessage::SelectionChanged.into()),
 				});
 
+				self.tool_is_active = true;
+
 				let tool_data = &mut self.tool_state.tool_data;
 				let document_data = &self.tool_state.document_tool_data;
 				let active_tool = &tool_data.active_tool_type;

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

@@ -539,7 +539,6 @@ impl Fsm for PenToolFsmState {
 				// Perform extension of an existing path
 				let selected_nodes = document.network_interface.selected_nodes(&[]).unwrap();
 				if let Some((layer, point, position)) = should_extend(document, viewport, crate::consts::SNAP_POINT_TOLERANCE, selected_nodes.selected_layers(document.metadata())) {
-					log::debug!("Should extend: {:?}", layer);
 					tool_data.add_point(LastPoint {
 						id: point,
 						pos: position,
@@ -550,7 +549,6 @@ impl Fsm for PenToolFsmState {
 					tool_data.next_point = position;
 					tool_data.next_handle_start = position;
 				} else if let (Some(layer), None) = (selected_layers.next(), selected_layers.next()) {
-					log::debug!("Adding to layer: {:?}", layer);
 					// Add the first point to a new layer
 					// Generate first point
 					let id = PointId::generate();
@@ -566,7 +564,6 @@ impl Fsm for PenToolFsmState {
 					tool_data.next_point = pos;
 					tool_data.next_handle_start = pos;
 				} else {
-					log::debug!("Creating new layer");
 					// New path layer
 					let node_type = resolve_document_node_type("Path").expect("Path node does not exist");
 					let nodes = vec![(NodeId(0), node_type.default_node_template())];

editor/src/messages/tool/utility_types.rs

@@ -477,7 +477,7 @@ pub fn tool_type_to_activate_tool_message(tool_type: ToolType) -> ToolMessageDis
 	}
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize, specta::Type)]
+#[derive(Debug, Default, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize, specta::Type)]
 pub struct HintData(pub Vec<HintGroup>);
 
 #[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize, specta::Type)]