Tidy up number text alignment and decimal precision for quick measurement overlays

Author: singhutsav5502

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

@@ -19,9 +19,9 @@ fn draw_line_with_length(
 	transform: DAffine2,
 	document_to_viewport: DAffine2,
 	overlay_context: &mut OverlayContext,
-	is_vertical_line: Option<bool>,
-	text_on_left: Option<bool>,
-	text_on_top: Option<bool>,
+	is_vertical_line: bool,
+	text_on_left: bool,
+	text_on_top: bool,
 ) {
 	let transform_to_document = document_to_viewport.inverse() * transform;
 	let min_viewport = transform.transform_point2(line_start);
@@ -37,11 +37,10 @@ fn draw_line_with_length(
 	// Adjust text position based on line orientation and flags
 	// Determine text position based on line orientation and flags
 	let (pivot_x, pivot_y) = match (is_vertical_line, text_on_left, text_on_top) {
-		(Some(true), Some(true), _) => (Pivot::End, Pivot::Middle),     // Vertical line, text on the left
-		(Some(true), Some(false), _) => (Pivot::Start, Pivot::Middle),  // Vertical line, text on the right
-		(Some(false), _, Some(true)) => (Pivot::Middle, Pivot::End),    // Horizontal line, text on top
-		(Some(false), _, Some(false)) => (Pivot::Middle, Pivot::Start), // Horizontal line, text on bottom
-		_ => (Pivot::Middle, Pivot::Middle),                            // Handle the case where `is_vertical_line` or the others are None or not true
+		(true, true, _) => (Pivot::End, Pivot::Middle),     // Vertical line, text on the left
+		(true, false, _) => (Pivot::Start, Pivot::Middle),  // Vertical line, text on the right
+		(false, _, true) => (Pivot::Middle, Pivot::End),    // Horizontal line, text on top
+		(false, _, false) => (Pivot::Middle, Pivot::Start), // Horizontal line, text on bottom
 	};
 	overlay_context.text(&length, COLOR_OVERLAY_BLUE, None, DAffine2::from_translation(midpoint), text_padding, [pivot_x, pivot_y]);
 }
@@ -72,16 +71,7 @@ fn draw_zero_axis_crossings(selected_bounds: Rect, hovered_bounds: Rect, transfo
 	// Draw horizontal solid line with length
 	let line_start = DVec2::new(selected_x, selected_y);
 	let line_end = DVec2::new(hovered_x, selected_y);
-	draw_line_with_length(
-		line_start,
-		line_end,
-		transform,
-		document_to_viewport,
-		overlay_context,
-		Some(false),
-		Some(false),
-		Some(!selected_on_bottom),
-	);
+	draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, false, false, !selected_on_bottom);
 
 	// Draw horizontal dashed line
 	let line_start = DVec2::new(selected_x, hovered_y);
@@ -91,16 +81,7 @@ fn draw_zero_axis_crossings(selected_bounds: Rect, hovered_bounds: Rect, transfo
 	// Draw vertical solid line with length
 	let line_start = DVec2::new(selected_x, selected_y);
 	let line_end = DVec2::new(selected_x, hovered_y);
-	draw_line_with_length(
-		line_start,
-		line_end,
-		transform,
-		document_to_viewport,
-		overlay_context,
-		Some(true),
-		Some(!selected_on_right),
-		Some(false),
-	);
+	draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, true, !selected_on_right, false);
 
 	// Draw vertical dashed line
 	let line_start = DVec2::new(hovered_x, selected_y);
@@ -127,30 +108,12 @@ fn draw_single_axis_zero_crossings(selected_bounds: Rect, hovered_bounds: Rect,
 		// Draw horizontal solid line with length
 		let line_start = DVec2::new(f64::min(hovered_max.x, selected_max.x), selected_facing_edge);
 		let line_end = DVec2::new(f64::max(hovered_min.x, selected_min.x), selected_facing_edge);
-		draw_line_with_length(
-			line_start,
-			line_end,
-			transform,
-			document_to_viewport,
-			overlay_context,
-			Some(false),
-			Some(false),
-			Some(selected_on_bottom),
-		);
+		draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, false, false, selected_on_bottom);
 
 		// Draw vertical solid line with length
 		let line_start = DVec2::new(vertical_line_start_x, selected_facing_edge);
 		let line_end = DVec2::new(vertical_line_start_x, hovered_facing_edge);
-		draw_line_with_length(
-			line_start,
-			line_end,
-			transform,
-			document_to_viewport,
-			overlay_context,
-			Some(true),
-			Some(!selected_on_right),
-			Some(false),
-		);
+		draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, true, !selected_on_right, false);
 
 		// Draw vertical dashed line
 		let dashed_line_start = DVec2::new(dashed_vertical_line_start_x, selected_facing_edge);
@@ -165,30 +128,12 @@ fn draw_single_axis_zero_crossings(selected_bounds: Rect, hovered_bounds: Rect,
 		// Draw vertical solid line with length
 		let line_start = DVec2::new(selected_facing_edge, f64::min(hovered_max.y, selected_max.y));
 		let line_end = DVec2::new(selected_facing_edge, f64::max(hovered_min.y, selected_min.y));
-		draw_line_with_length(
-			line_start,
-			line_end,
-			transform,
-			document_to_viewport,
-			overlay_context,
-			Some(false),
-			Some(false),
-			Some(selected_on_bottom),
-		);
+		draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, false, false, selected_on_bottom);
 
 		// Draw horizontal solid line with length
 		let line_start = DVec2::new(selected_facing_edge, horizontal_line_start_y);
 		let line_end = DVec2::new(hovered_facing_edge, horizontal_line_start_y);
-		draw_line_with_length(
-			line_start,
-			line_end,
-			transform,
-			document_to_viewport,
-			overlay_context,
-			Some(true),
-			Some(!selected_on_right),
-			Some(false),
-		);
+		draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, true, !selected_on_right, false);
 
 		// Draw horizontal dashed line
 		let dashed_line_start = DVec2::new(selected_facing_edge, dashed_horizontal_line_start_y);
@@ -220,7 +165,7 @@ fn draw_single_axis_one_crossings(selected_bounds: Rect, hovered_bounds: Rect, t
 		// Draw vertical solid line with length
 		let line_start = DVec2::new(vertical_line_start, selected_facing_edge);
 		let line_end = DVec2::new(vertical_line_start, hovered_facing_edge);
-		draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, Some(true), Some(true), Some(false));
+		draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, true, true, false);
 	} else if overlap_x {
 		let selected_facing_edge = if hovered_max.x < selected_min.x { selected_min.x } else { selected_max.x };
 		let hovered_facing_edge = if hovered_max.x < selected_min.x { hovered_max.x } else { hovered_min.x };
@@ -233,7 +178,7 @@ fn draw_single_axis_one_crossings(selected_bounds: Rect, hovered_bounds: Rect, t
 		// Draw horizontal solid line with length
 		let line_start = DVec2::new(selected_facing_edge, horizontal_line_start_y);
 		let line_end = DVec2::new(hovered_facing_edge, horizontal_line_start_y);
-		draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(true));
+		draw_line_with_length(line_start, line_end, transform, document_to_viewport, overlay_context, false, false, true);
 	}
 }
 
@@ -258,20 +203,20 @@ fn draw_two_axis_one_one_crossing(selected_bounds: Rect, hovered_bounds: Rect, t
 	// Draw horizontal solid lines with length
 	let top_x_start = DVec2::new(f64::min(selected_max.x, hovered_max.x), top_y_bound);
 	let top_x_end = DVec2::new(f64::max(selected_max.x, hovered_max.x), top_y_bound);
-	draw_line_with_length(top_x_start, top_x_end, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(true));
+	draw_line_with_length(top_x_start, top_x_end, transform, document_to_viewport, overlay_context, false, false, true);
 
 	let bottom_x_start = DVec2::new(f64::min(selected_min.x, hovered_min.x), bottom_y_bound);
 	let bottom_x_end = DVec2::new(f64::max(selected_min.x, hovered_min.x), bottom_y_bound);
-	draw_line_with_length(bottom_x_start, bottom_x_end, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(false));
+	draw_line_with_length(bottom_x_start, bottom_x_end, transform, document_to_viewport, overlay_context, false, false, false);
 
 	// Draw vertical solid lines with length
 	let top_y_start = DVec2::new(top_x_bound, f64::min(selected_min.y, hovered_min.y));
 	let top_y_end = DVec2::new(top_x_bound, f64::max(selected_min.y, hovered_min.y));
-	draw_line_with_length(top_y_start, top_y_end, transform, document_to_viewport, overlay_context, Some(true), Some(false), Some(false));
+	draw_line_with_length(top_y_start, top_y_end, transform, document_to_viewport, overlay_context, true, false, false);
 
 	let bottom_y_start = DVec2::new(bottom_x_bound, f64::min(selected_max.y, hovered_max.y));
 	let bottom_y_end = DVec2::new(bottom_x_bound, f64::max(selected_max.y, hovered_max.y));
-	draw_line_with_length(bottom_y_start, bottom_y_end, transform, document_to_viewport, overlay_context, Some(true), Some(true), Some(false));
+	draw_line_with_length(bottom_y_start, bottom_y_end, transform, document_to_viewport, overlay_context, true, true, false);
 }
 
 /// Draws measurements for partial overlaps with two vertical or horizontal edge intersections.
@@ -297,11 +242,11 @@ fn draw_two_axis_one_one_two_zero_crossing(
 		// Draw vertical solid lines with length
 		let y_start_left = DVec2::new(hovered_min.x, f64::min(selected_bound_edge, hovered_bound_edge));
 		let y_end_left = DVec2::new(hovered_min.x, f64::max(selected_bound_edge, hovered_bound_edge));
-		draw_line_with_length(y_start_left, y_end_left, transform, document_to_viewport, overlay_context, Some(true), Some(true), Some(false));
+		draw_line_with_length(y_start_left, y_end_left, transform, document_to_viewport, overlay_context, true, true, false);
 
 		let y_start_right = DVec2::new(hovered_max.x, f64::min(selected_bound_edge, hovered_bound_edge));
 		let y_end_right = DVec2::new(hovered_max.x, f64::max(selected_bound_edge, hovered_bound_edge));
-		draw_line_with_length(y_start_right, y_end_right, transform, document_to_viewport, overlay_context, Some(true), Some(false), Some(false));
+		draw_line_with_length(y_start_right, y_end_right, transform, document_to_viewport, overlay_context, true, false, false);
 
 		// Draw horizontal solid lines with length
 		let horizontal_line_y_bound = if selected_bounds.center().y >= hovered_bounds.center().y {
@@ -312,11 +257,11 @@ fn draw_two_axis_one_one_two_zero_crossing(
 
 		let x_start_left = DVec2::new(hovered_min.x, horizontal_line_y_bound);
 		let x_end_left = DVec2::new(selected_min.x, horizontal_line_y_bound);
-		draw_line_with_length(x_start_left, x_end_left, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(false));
+		draw_line_with_length(x_start_left, x_end_left, transform, document_to_viewport, overlay_context, false, false, false);
 
 		let x_start_right = DVec2::new(hovered_max.x, horizontal_line_y_bound);
 		let x_end_right = DVec2::new(selected_max.x, horizontal_line_y_bound);
-		draw_line_with_length(x_start_right, x_end_right, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(false));
+		draw_line_with_length(x_start_right, x_end_right, transform, document_to_viewport, overlay_context, false, false, false);
 	} else {
 		let selected_bound_edge = if selected_bounds.center().x >= hovered_bounds.center().x {
 			selected_max.x
@@ -335,11 +280,11 @@ fn draw_two_axis_one_one_two_zero_crossing(
 		// Draw vertical solid lines with length
 		let y_start_up = DVec2::new(vertical_line_x, selected_min.y);
 		let y_end_up = DVec2::new(vertical_line_x, hovered_min.y);
-		draw_line_with_length(y_start_up, y_end_up, transform, document_to_viewport, overlay_context, Some(true), Some(false), Some(false));
+		draw_line_with_length(y_start_up, y_end_up, transform, document_to_viewport, overlay_context, true, false, false);
 
 		let y_start_down = DVec2::new(vertical_line_x, selected_max.y);
 		let y_end_down = DVec2::new(vertical_line_x, hovered_max.y);
-		draw_line_with_length(y_start_down, y_end_down, transform, document_to_viewport, overlay_context, Some(true), Some(false), Some(false));
+		draw_line_with_length(y_start_down, y_end_down, transform, document_to_viewport, overlay_context, true, false, false);
 
 		// Draw horizontal solid lines with length
 		let horizontal_line_inner_x = if selected_bounds.center().x >= hovered_bounds.center().x {
@@ -349,11 +294,11 @@ fn draw_two_axis_one_one_two_zero_crossing(
 		};
 		let x_start_up = DVec2::new(vertical_line_x, f64::min(selected_min.y, hovered_min.y));
 		let x_end_up = DVec2::new(horizontal_line_inner_x, f64::min(selected_min.y, hovered_min.y));
-		draw_line_with_length(x_start_up, x_end_up, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(true));
+		draw_line_with_length(x_start_up, x_end_up, transform, document_to_viewport, overlay_context, false, false, true);
 
 		let x_start_down = DVec2::new(vertical_line_x, f64::max(selected_max.y, hovered_max.y));
 		let x_end_down = DVec2::new(horizontal_line_inner_x, f64::max(selected_max.y, hovered_max.y));
-		draw_line_with_length(x_start_down, x_end_down, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(false));
+		draw_line_with_length(x_start_down, x_end_down, transform, document_to_viewport, overlay_context, false, false, false);
 	}
 }
 
@@ -365,90 +310,36 @@ fn draw_two_axis_two_zero_zero_two(selected_bounds: Rect, hovered_bounds: Rect,
 	// Draw vertical solid lines with length
 	let y_start_left_top = DVec2::new(f64::min(hovered_min.x, selected_min.x), f64::min(hovered_min.y, selected_min.y));
 	let y_end_left_top = DVec2::new(f64::min(hovered_min.x, selected_min.x), f64::max(hovered_min.y, selected_min.y));
-	draw_line_with_length(y_start_left_top, y_end_left_top, transform, document_to_viewport, overlay_context, Some(true), Some(true), Some(false));
+	draw_line_with_length(y_start_left_top, y_end_left_top, transform, document_to_viewport, overlay_context, true, true, false);
 
 	let y_start_left_bottom = DVec2::new(f64::min(hovered_min.x, selected_min.x), f64::min(hovered_max.y, selected_max.y));
 	let y_end_left_bottom = DVec2::new(f64::min(hovered_min.x, selected_min.x), f64::max(hovered_max.y, selected_max.y));
-	draw_line_with_length(
-		y_start_left_bottom,
-		y_end_left_bottom,
-		transform,
-		document_to_viewport,
-		overlay_context,
-		Some(true),
-		Some(true),
-		Some(false),
-	);
+	draw_line_with_length(y_start_left_bottom, y_end_left_bottom, transform, document_to_viewport, overlay_context, true, true, false);
 
 	let y_start_right_top = DVec2::new(f64::max(hovered_max.x, selected_max.x), f64::min(hovered_min.y, selected_min.y));
 	let y_end_right_top = DVec2::new(f64::max(hovered_max.x, selected_max.x), f64::max(hovered_min.y, selected_min.y));
-	draw_line_with_length(
-		y_start_right_top,
-		y_end_right_top,
-		transform,
-		document_to_viewport,
-		overlay_context,
-		Some(true),
-		Some(false),
-		Some(false),
-	);
+	draw_line_with_length(y_start_right_top, y_end_right_top, transform, document_to_viewport, overlay_context, true, false, false);
 
 	let y_start_right_bottom = DVec2::new(f64::max(hovered_max.x, selected_max.x), f64::min(hovered_max.y, selected_max.y));
 	let y_end_right_bottom = DVec2::new(f64::max(hovered_max.x, selected_max.x), f64::max(hovered_max.y, selected_max.y));
-	draw_line_with_length(
-		y_start_right_bottom,
-		y_end_right_bottom,
-		transform,
-		document_to_viewport,
-		overlay_context,
-		Some(true),
-		Some(false),
-		Some(false),
-	);
+	draw_line_with_length(y_start_right_bottom, y_end_right_bottom, transform, document_to_viewport, overlay_context, true, false, false);
 
 	// Draw horizontal solid lines with length
 	let x_start_left_top = DVec2::new(f64::min(hovered_min.x, selected_min.x), f64::min(hovered_min.y, selected_min.y));
 	let x_end_left_top = DVec2::new(f64::max(hovered_min.x, selected_min.x), f64::min(hovered_min.y, selected_min.y));
-	draw_line_with_length(x_start_left_top, x_end_left_top, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(true));
+	draw_line_with_length(x_start_left_top, x_end_left_top, transform, document_to_viewport, overlay_context, false, false, true);
 
 	let x_start_right_top = DVec2::new(f64::min(hovered_max.x, selected_max.x), f64::min(hovered_min.y, selected_min.y));
 	let x_end_right_top = DVec2::new(f64::max(hovered_max.x, selected_max.x), f64::min(hovered_min.y, selected_min.y));
-	draw_line_with_length(
-		x_start_right_top,
-		x_end_right_top,
-		transform,
-		document_to_viewport,
-		overlay_context,
-		Some(false),
-		Some(false),
-		Some(true),
-	);
+	draw_line_with_length(x_start_right_top, x_end_right_top, transform, document_to_viewport, overlay_context, false, false, true);
 
 	let x_start_left_bottom = DVec2::new(f64::min(hovered_min.x, selected_min.x), f64::max(hovered_max.y, selected_max.y));
 	let x_end_left_bottom = DVec2::new(f64::max(hovered_min.x, selected_min.x), f64::max(hovered_max.y, selected_max.y));
-	draw_line_with_length(
-		x_start_left_bottom,
-		x_end_left_bottom,
-		transform,
-		document_to_viewport,
-		overlay_context,
-		Some(false),
-		Some(false),
-		Some(false),
-	);
+	draw_line_with_length(x_start_left_bottom, x_end_left_bottom, transform, document_to_viewport, overlay_context, false, false, false);
 
 	let x_start_right_bottom = DVec2::new(f64::min(hovered_max.x, selected_max.x), f64::max(hovered_max.y, selected_max.y));
 	let x_end_right_bottom = DVec2::new(f64::max(hovered_max.x, selected_max.x), f64::max(hovered_max.y, selected_max.y));
-	draw_line_with_length(
-		x_start_right_bottom,
-		x_end_right_bottom,
-		transform,
-		document_to_viewport,
-		overlay_context,
-		Some(false),
-		Some(false),
-		Some(false),
-	);
+	draw_line_with_length(x_start_right_bottom, x_end_right_bottom, transform, document_to_viewport, overlay_context, false, false, false);
 }
 
 /// Draws measurements where selected and hovered bounds have two vertical edges crossing each other.
@@ -459,20 +350,20 @@ fn draw_two_axis_two_zero_two_zero(selected_bounds: Rect, hovered_bounds: Rect,
 	// Draw horizontal solid lines with length
 	let x_start_left = DVec2::new(f64::max(hovered_min.x, selected_min.x), selected_bounds.center().y);
 	let x_end_left = DVec2::new(f64::min(hovered_min.x, selected_min.x), selected_bounds.center().y);
-	draw_line_with_length(x_start_left, x_end_left, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(true));
+	draw_line_with_length(x_start_left, x_end_left, transform, document_to_viewport, overlay_context, false, false, true);
 
 	let x_start_right = DVec2::new(f64::min(hovered_max.x, selected_max.x), selected_bounds.center().y);
 	let x_end_right = DVec2::new(f64::max(hovered_max.x, selected_max.x), selected_bounds.center().y);
-	draw_line_with_length(x_start_right, x_end_right, transform, document_to_viewport, overlay_context, Some(false), Some(false), Some(true));
+	draw_line_with_length(x_start_right, x_end_right, transform, document_to_viewport, overlay_context, false, false, true);
 
 	// Draw vertical solid lines with length
 	let y_start_top = DVec2::new(selected_bounds.center().x, f64::max(hovered_min.y, selected_min.y));
 	let y_end_top = DVec2::new(selected_bounds.center().x, f64::min(hovered_min.y, selected_min.y));
-	draw_line_with_length(y_start_top, y_end_top, transform, document_to_viewport, overlay_context, Some(true), Some(false), Some(false));
+	draw_line_with_length(y_start_top, y_end_top, transform, document_to_viewport, overlay_context, true, false, false);
 
 	let y_start_bottom = DVec2::new(selected_bounds.center().x, f64::min(hovered_max.y, selected_max.y));
 	let y_end_bottom = DVec2::new(selected_bounds.center().x, f64::max(hovered_max.y, selected_max.y));
-	draw_line_with_length(y_start_bottom, y_end_bottom, transform, document_to_viewport, overlay_context, Some(true), Some(false), Some(false));
+	draw_line_with_length(y_start_bottom, y_end_bottom, transform, document_to_viewport, overlay_context, true, false, false);
 }
 
 /// Handles overlapping scenarios involving two axes between selected and hovered bounds.