fix selection insideness checking

Author: indierusty

node-graph/gcore/src/vector/algorithms/bezpath_algorithms.rs

@@ -608,6 +608,7 @@ pub fn round_line_join(bezpath1: &BezPath, bezpath2: &BezPath, center: DVec2) ->
 }
 
 /// Returns `true` if the `bezpath1` is completely inside the `bezpath2`.
+/// NOTE: The `bezpath2` has to be a closed path to get correct result.
 pub fn bezpath_is_inside_bezpath(bezpath1: &BezPath, bezpath2: &BezPath, accuracy: Option<f64>, minimum_separation: Option<f64>) -> bool {
 	// Eliminate any possibility of one being inside the other, if either of them is empty
 	if bezpath1.is_empty() || bezpath2.is_empty() {
@@ -617,19 +618,25 @@ pub fn bezpath_is_inside_bezpath(bezpath1: &BezPath, bezpath2: &BezPath, accurac
 	let inner_bbox = bezpath1.bounding_box();
 	let outer_bbox = bezpath2.bounding_box();
 
-	// Eliminate 'bezpath1' if its bounding box is completely outside the bezpath2's bounding box
+	// Eliminate if the 'bezpath1' bounding box is completely outside the bezpath2's bounding box
 	if !outer_bbox.contains_rect(inner_bbox) && outer_bbox.intersect(inner_bbox).is_zero_area() {
 		return false;
 	}
 
-	// Eliminate this subpath if it intersects with the other subpath.
+	// Eliminate if any anchors point of the 'bezpath1' is outside the 'bezpath2'.
+	if !bezpath1.elements().iter().filter_map(|elm| elm.end_point()).all(|point| bezpath2.contains(point)) {
+		return false;
+	}
+
+	// Eliminate if 'bezpath1' intersects with 'bezpath2'.
 	if !bezpath_intersections(bezpath1, &bezpath2, accuracy, minimum_separation).is_empty() {
 		return false;
 	}
 
 	// At this point:
 	// (1) The 'bezpath1' bounding box either intersect or is inside the 'bezpath2's bounding box,
-	// (2) The 'bezpath1' is not intersecting with the 'bezpath2'.
+	// (2) All the anchor point of the 'bezpath1' is inside 'bezpath2'
+	// (3) The 'bezpath1' is not intersecting with the 'bezpath2'.
 	// Hence, this subpath is completely inside the given other subpath.
 	true
 }

node-graph/gcore/src/vector/click_target.rs

@@ -1,12 +1,12 @@
-use super::algorithms::intersection::filtered_segment_intersections;
+use super::algorithms::{bezpath_algorithms::bezpath_is_inside_bezpath, intersection::filtered_segment_intersections};
 use super::misc::dvec2_to_point;
 use crate::math::math_ext::QuadExt;
 use crate::math::quad::Quad;
 use crate::subpath::Subpath;
 use crate::vector::PointId;
 use crate::vector::misc::point_to_dvec2;
 use glam::{DAffine2, DMat2, DVec2};
-use kurbo::{Affine, ParamCurve, PathSeg, Point, Shape};
+use kurbo::{Affine, BezPath, ParamCurve, PathSeg, Shape};
 
 #[derive(Copy, Clone, Debug, PartialEq, serde::Serialize, serde::Deserialize)]
 pub struct FreePoint {
@@ -125,9 +125,11 @@ impl ClickTarget {
 					return true;
 				}
 
+				let mut selection = BezPath::from_path_segments(bezier_iter());
+				selection.close_path();
+
 				// Check if shape is entirely within selection
-				let any_point_from_subpath = subpath.manipulator_groups().first().map(|manipulators| manipulators.anchor);
-				any_point_from_subpath.is_some_and(|shape_point| bezier_iter().map(|bezier| bezier.winding(Point::new(shape_point.x, shape_point.y))).sum::<i32>() != 0)
+				bezpath_is_inside_bezpath(&subpath.to_bezpath(), &selection, None, None)
 			}
 			ClickTargetType::FreePoint(point) => bezier_iter().map(|bezier: PathSeg| bezier.winding(dvec2_to_point(point.position))).sum::<i32>() != 0,
 		}