Fix deselecting user selection when anchors are disabled

Author: seam0s-dev

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

@@ -42,6 +42,8 @@ pub enum ManipulatorAngle {
 #[derive(Clone, Debug, Default)]
 pub struct SelectedLayerState {
 	selected_points: HashSet<ManipulatorPointId>,
+	ignore_handles: bool,
+	ignore_anchors: bool,
 }
 
 impl SelectedLayerState {
@@ -52,11 +54,23 @@ impl SelectedLayerState {
 		self.selected_points.contains(&point)
 	}
 	pub fn select_point(&mut self, point: ManipulatorPointId) {
+		if (point.as_handle().is_some() && self.ignore_handles) || (point.as_anchor().is_some() && self.ignore_anchors) {
+			return;
+		}
 		self.selected_points.insert(point);
 	}
 	pub fn deselect_point(&mut self, point: ManipulatorPointId) {
+		if (point.as_handle().is_some() && self.ignore_handles) || (point.as_anchor().is_some() && self.ignore_anchors) {
+			return;
+		}
 		self.selected_points.remove(&point);
 	}
+	pub fn set_handles_status(&mut self, ignore: bool) {
+		self.ignore_handles = ignore;
+	}
+	pub fn set_anchors_status(&mut self, ignore: bool) {
+		self.ignore_anchors = ignore;
+	}
 	pub fn clear_points(&mut self) {
 		self.selected_points.clear();
 	}
@@ -496,13 +510,37 @@ impl ShapeState {
 		}
 	}
 
+	pub fn mark_selected_anchors(&mut self) {
+		for state in self.selected_shape_state.values_mut() {
+			state.set_anchors_status(false);
+		}
+	}
+
+	pub fn mark_selected_handles(&mut self) {
+		for state in self.selected_shape_state.values_mut() {
+			state.set_handles_status(false);
+		}
+	}
+
+	pub fn ignore_selected_anchors(&mut self) {
+		for state in self.selected_shape_state.values_mut() {
+			state.set_anchors_status(true);
+		}
+	}
+
+	pub fn ignore_selected_handles(&mut self) {
+		for state in self.selected_shape_state.values_mut() {
+			state.set_handles_status(true);
+		}
+	}
+
 	/// Deselects all the anchors across every selected layer.
 	pub fn deselect_all_anchors(&mut self) {
 		for (_, state) in self.selected_shape_state.iter_mut() {
 			let selected_anchor_points: Vec<ManipulatorPointId> = state
 				.selected_points
 				.iter()
-				.filter(|selected_point| matches!(selected_point, ManipulatorPointId::Anchor(_)))
+				.filter(|selected_point| selected_point.as_anchor().is_some())
 				.cloned()
 				.collect();
 
@@ -518,7 +556,7 @@ impl ShapeState {
 			let selected_handle_points: Vec<ManipulatorPointId> = state
 				.selected_points
 				.iter()
-				.filter(|selected_point| matches!(selected_point, ManipulatorPointId::PrimaryHandle(_) | ManipulatorPointId::EndHandle(_)))
+				.filter(|selected_point| selected_point.as_handle().is_some())
 				.cloned()
 				.collect();
 
@@ -636,7 +674,7 @@ impl ShapeState {
 		Some(())
 	}
 
-	/// Iterates over the selected manipulator groups exluding endpoints, returning whether their handles have mixed, colinear, or free angles.
+	/// Iterates over the selected manipulator groups excluding endpoints, returning whether their handles have mixed, colinear, or free angles.
 	/// If there are no points selected this function returns mixed.
 	pub fn selected_manipulator_angles(&self, network_interface: &NodeNetworkInterface) -> ManipulatorAngle {
 		// This iterator contains a bool indicating whether or not selected points' manipulator groups have colinear handles.

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

@@ -1015,10 +1015,16 @@ impl Fsm for PathToolFsmState {
 				let display_anchors = overlay_context.visibility_settings.anchors();
 				let display_handles = overlay_context.visibility_settings.handles();
 				if !display_handles {
-					shape_editor.deselect_all_handles();
+					shape_editor.ignore_selected_handles();
+				}
+				else {
+					shape_editor.mark_selected_handles();
 				}
 				if !display_anchors {
-					shape_editor.deselect_all_anchors();
+					shape_editor.ignore_selected_anchors();
+				}
+				else {
+					shape_editor.mark_selected_anchors();
 				}
 
 				// TODO: find the segment ids of which the selected points are a part of

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

@@ -852,7 +852,7 @@ impl Fsm for SelectToolFsmState {
 				let is_over_pivot = tool_data.pivot.is_over(mouse_position);
 
 				let show_compass = bounds.is_some_and(|quad| quad.all_sides_at_least_width(COMPASS_ROSE_HOVER_RING_DIAMETER) && quad.contains(mouse_position));
-				/// If bounding box is some, compass_rose_state.can_grab() && show_compass is evaluated else compass_rose_state.can_grab() is evaluated
+				// If bounding box is some, compass_rose_state.can_grab() && show_compass is evaluated else compass_rose_state.can_grab() is evaluated
 				let can_grab_compass_rose = compass_rose_state.can_grab() && (show_compass || bounds.is_none());
 				let is_flat_layer = tool_data
 					.bounding_box_manager
@@ -916,7 +916,9 @@ impl Fsm for SelectToolFsmState {
 				// Dragging the selected layers around to transform them
 				else if can_grab_compass_rose || intersection.is_some_and(|intersection| selected.iter().any(|selected_layer| intersection.starts_with(*selected_layer, document.metadata()))) {
 					responses.add(DocumentMessage::StartTransaction);
-					
+					debug!("Starting drag on the layers!");
+					debug!("can_grab_compass_rose: {:?} ---> compass_rose_state.can_grab(): {:?}, show_compass: {:?}", can_grab_compass_rose, compass_rose_state.can_grab(), show_compass);
+
 					if input.keyboard.key(select_deepest) || tool_data.nested_selection_behavior == NestedSelectionBehavior::Deepest {
 						tool_data.select_single_layer = intersection;
 					} else {
@@ -1024,9 +1026,18 @@ impl Fsm for SelectToolFsmState {
 
 				let mouse_delta = snap_drag(start, current, tool_data.axis_align, axis, snap_data, &mut tool_data.snap_manager, &tool_data.snap_candidates);
 				let mouse_delta = match axis {
-					Axis::X => mouse_delta.project_onto(e0),
-					Axis::Y => mouse_delta.project_onto(e0.perp()),
-					Axis::None => mouse_delta,
+					Axis::X =>  {
+						debug!("The axis is on X!");
+						mouse_delta.project_onto(e0)
+					},
+					Axis::Y => {
+						debug!("The axis is on Y!");
+						mouse_delta.project_onto(e0.perp()) 
+					},
+					Axis::None => {
+						debug!("The axis is on both X and Y!");
+						mouse_delta
+					},
 				};
 
 				// TODO: Cache the result of `shallowest_unique_layers` to avoid this heavy computation every frame of movement, see https://github.com/GraphiteEditor/Graphite/pull/481