Work on rect grid lines

Author: bluelinden

editor/src/messages/portfolio/document/overlays/grid_overlays.rs

@@ -25,7 +25,16 @@ fn grid_overlay_rectangular(document: &DocumentMessageHandler, overlay_context:
 		let primary_start = bounds.0.iter().map(|&corner| corner[primary]).min_by(|a, b| a.partial_cmp(b).unwrap()).unwrap_or_default();
 		let primary_end = bounds.0.iter().map(|&corner| corner[primary]).max_by(|a, b| a.partial_cmp(b).unwrap()).unwrap_or_default();
 		let spacing = spacing[secondary];
+		let first_index = ((min - origin[secondary]) / spacing).ceil() as i32;
 		for line_index in 0..=((max - min) / spacing).ceil() as i32 {
+			let is_major = is_major_line(
+				line_index + first_index,
+				if primary == 1 {
+					document.snapping_state.grid.rectangular_major_interval_along_x
+				} else {
+					document.snapping_state.grid.rectangular_major_interval_along_y
+				},
+			);
 			let secondary_pos = (((min - origin[secondary]) / spacing).ceil() + line_index as f64) * spacing + origin[secondary];
 			let start = if primary == 0 {
 				DVec2::new(primary_start, secondary_pos)
@@ -40,24 +49,16 @@ fn grid_overlay_rectangular(document: &DocumentMessageHandler, overlay_context:
 			overlay_context.line(
 				document_to_viewport.transform_point2(start),
 				document_to_viewport.transform_point2(end),
-				is_major_line(
-					line_index,
-					if primary == 0 {
-						document.snapping_state.grid.rectangular_major_interval_along_x
-					} else {
-						document.snapping_state.grid.rectangular_major_interval_along_y
-					},
-				)
-				.then_some(if document.snapping_state.grid.major_is_thick { &grid_color } else { &grid_color_minor }),
-				is_major_line(
-					line_index,
-					if primary == 0 {
-						document.snapping_state.grid.rectangular_major_interval_along_x
-					} else {
-						document.snapping_state.grid.rectangular_major_interval_along_y
-					},
-				)
-				.then_some(if document.snapping_state.grid.major_is_thick { 3. } else { 1. }),
+				if is_major {
+					Some(&grid_color)
+				} else {
+					Some(&grid_color_minor)
+				},
+				if is_major && document.snapping_state.grid.major_is_thick {
+					Some(3.)
+				} else {
+					Some(1.)
+				},
 			);
 		}
 	}

editor/src/messages/portfolio/document/utility_types/misc.rs

@@ -246,7 +246,7 @@ impl Default for GridSnapping {
 			isometric_major_interval_along_a: 1,
 			grid_color: Color::from_rgb_str(COLOR_OVERLAY_GRAY_DARK.strip_prefix('#').unwrap()).unwrap().with_alpha(0.4),
 			grid_color_minor: Color::from_rgb_str(COLOR_OVERLAY_GRAY_DARK.strip_prefix('#').unwrap()).unwrap().with_alpha(0.2),
-			major_is_thick: true,
+			major_is_thick: false,
 			dot_display: false,
 		}
 	}
@@ -281,15 +281,11 @@ impl GridSnapping {
 		}
 		Some(multiplier)
 	}
-	
+
 	pub fn has_minor_lines(&self) -> bool {
 		match self.grid_type {
 			GridType::Rectangular { .. } => self.rectangular_major_interval_along_x > 1 || self.rectangular_major_interval_along_y > 1,
-			GridType::Isometric { .. } => {
-				self.isometric_major_interval_along_x > 1
-					|| self.isometric_major_interval_along_a > 1
-					|| self.isometric_major_interval_along_b > 1
-			}
+			GridType::Isometric { .. } => self.isometric_major_interval_along_x > 1 || self.isometric_major_interval_along_a > 1 || self.isometric_major_interval_along_b > 1,
 		}
 	}
 }