Limit the stroke distance to half width

c-mateo · c-mateo · commit de70263ddccb · 2025-06-09T16:14:08.000-03:00
diff --git a/editor/src/messages/portfolio/document/overlays/utility_types.rs b/editor/src/messages/portfolio/document/overlays/utility_types.rs
@@ -732,7 +732,7 @@ impl OverlayContext {
 	pub fn fill_path(&mut self, subpaths: impl Iterator<Item = impl Borrow<Subpath<PointId>>>, transform: DAffine2, color: &Color, with_pattern: bool, stroke_width: Option<f64>) {
 		self.render_context.save();
 		let transform_scale = transform.decompose_scale().x.max(transform.decompose_scale().y);
-		self.render_context.set_line_width(stroke_width.unwrap_or(1.) * transform_scale + 2.0);
+		self.render_context.set_line_width(stroke_width.unwrap_or(1.) * transform_scale);
 		self.draw_path_from_subpaths(subpaths, transform);
 
 		if with_pattern {
diff --git a/editor/src/messages/tool/tool_messages/fill_tool.rs b/editor/src/messages/tool/tool_messages/fill_tool.rs
@@ -3,6 +3,7 @@ use crate::messages::portfolio::document::overlays::utility_types::OverlayContex
 use crate::messages::tool::common_functionality::graph_modification_utils::{self, NodeGraphLayer, get_stroke_width};
 use graph_craft::document::value::TaggedValue;
 use graphene_core::vector::style::Fill;
+use graphene_std::transform::Transform;
 use graphene_std::vector::PointId;
 use graphene_std::vector::style::Stroke;
 
@@ -76,12 +77,14 @@ impl ToolTransition for FillTool {
 }
 
 pub fn close_to_subpath(mouse_pos: DVec2, subpath: bezier_rs::Subpath<PointId>, stroke_width: f64, to_viewport_transform: DAffine2) -> bool {
-	let stroke_width = stroke_width + 1.0;
 	let mouse_pos = to_viewport_transform.inverse().transform_point2(mouse_pos);
+	let transform_scale = to_viewport_transform.decompose_scale().x.max(to_viewport_transform.decompose_scale().y);
+	let threshold = (2.0 - transform_scale).exp2();
+	let max_stroke_distance = stroke_width * 0.5 + threshold;
 
 	if let Some((segment_index, t)) = subpath.project(mouse_pos) {
 		let nearest_point = subpath.evaluate(bezier_rs::SubpathTValue::Parametric { segment_index, t });
-		(mouse_pos - nearest_point).length() <= stroke_width
+		(mouse_pos - nearest_point).length() <= max_stroke_distance
 	} else {
 		false
 	}
