fmt

Author: bluelinden

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

@@ -2,7 +2,7 @@ use crate::messages::layout::utility_types::widget_prelude::*;
 use crate::messages::portfolio::document::overlays::utility_types::OverlayContext;
 use crate::messages::portfolio::document::utility_types::misc::{GridSnapping, GridType};
 use crate::messages::prelude::*;
-use glam::{DVec2,UVec2};
+use glam::{DVec2, UVec2};
 use graphene_std::raster::color::Color;
 use graphene_std::renderer::Quad;
 use graphene_std::vector::style::FillChoice;
@@ -48,18 +48,10 @@ fn grid_overlay_rectangular(document: &DocumentMessageHandler, overlay_context:
 				DVec2::new(secondary_pos, primary_end)
 			};
 			overlay_context.line(
-				document_to_viewport.transform_point2(start),	
+				document_to_viewport.transform_point2(start),
 				document_to_viewport.transform_point2(end),
-				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.)
-				},
+				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.) },
 			);
 		}
 	}
@@ -74,7 +66,7 @@ fn grid_overlay_rectangular_dot(document: &DocumentMessageHandler, overlay_conte
 	let origin = document.snapping_state.grid.origin;
 	let grid_color = "#".to_string() + &document.snapping_state.grid.grid_color.to_rgba_hex_srgb();
 	let grid_color_minor = "#".to_string() + &document.snapping_state.grid.grid_color_minor.to_rgba_hex_srgb();
-	let Some(spacing) = GridSnapping::compute_rectangle_spacing(spacing, &document.snapping_state.grid.rectangular_major_interval,  &document.document_ptz) else {
+	let Some(spacing) = GridSnapping::compute_rectangle_spacing(spacing, &document.snapping_state.grid.rectangular_major_interval, &document.document_ptz) else {
 		return;
 	};
 	let document_to_viewport = document.navigation_handler.calculate_offset_transform(overlay_context.size / 2., &document.document_ptz);

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

@@ -1,5 +1,5 @@
 use crate::consts::COLOR_OVERLAY_GRAY_DARK;
-use glam::{DVec2,UVec2, UVec3};
+use glam::{DVec2, UVec2, UVec3};
 use graphene_std::raster::Color;
 use std::fmt;
 
@@ -247,22 +247,22 @@ impl Default for GridSnapping {
 impl GridSnapping {
 	// Double grid size until it takes up at least 10px.
 	pub fn compute_rectangle_spacing(mut size: DVec2, major_interval: &UVec2, navigation: &PTZ) -> Option<DVec2> {
-			let mut iterations = 0;
-			size = size.abs();
-			while (size.x * navigation.zoom() < 10.) || (size.y * navigation.zoom() < 10.) {
-				if iterations > 100 {
-					return None;
-				}
-				if size.x * navigation.zoom() < 10. {
-					size.x *= if major_interval.x != 1 {major_interval.x as f64} else {2.};
-				}
-				if size.y * navigation.zoom() < 10. {
-					size.y *= if major_interval.y != 1 {major_interval.y as f64} else {2.};
-				}
-				iterations += 1;
+		let mut iterations = 0;
+		size = size.abs();
+		while (size.x * navigation.zoom() < 10.) || (size.y * navigation.zoom() < 10.) {
+			if iterations > 100 {
+				return None;
+			}
+			if size.x * navigation.zoom() < 10. {
+				size.x *= if major_interval.x != 1 { major_interval.x as f64 } else { 2. };
+			}
+			if size.y * navigation.zoom() < 10. {
+				size.y *= if major_interval.y != 1 { major_interval.y as f64 } else { 2. };
 			}
-			Some(size)
+			iterations += 1;
 		}
+		Some(size)
+	}
 
 	// Double grid size until it takes up at least 10px.
 	pub fn compute_isometric_multiplier(length: f64, divisor: f64, navigation: &PTZ) -> Option<f64> {
@@ -280,11 +280,11 @@ impl GridSnapping {
 	}
 
 	pub fn has_minor_lines(&self) -> bool {
-			match self.grid_type {
-				GridType::Rectangular { .. } => self.rectangular_major_interval.x > 1 || self.rectangular_major_interval.y > 1,
-				GridType::Isometric { .. } => self.isometric_major_interval.x > 1 || self.isometric_major_interval.z > 1 || self.isometric_major_interval.y > 1,
-			}
+		match self.grid_type {
+			GridType::Rectangular { .. } => self.rectangular_major_interval.x > 1 || self.rectangular_major_interval.y > 1,
+			GridType::Isometric { .. } => self.isometric_major_interval.x > 1 || self.isometric_major_interval.z > 1 || self.isometric_major_interval.y > 1,
 		}
+	}
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]

editor/src/messages/tool/common_functionality/snapping/grid_snapper.rs

@@ -1,6 +1,6 @@
 use super::*;
 use crate::messages::portfolio::document::utility_types::misc::{GridSnapTarget, GridSnapping, GridType, SnapTarget};
-use glam::{DVec2,UVec2};
+use glam::{DVec2, UVec2};
 use graphene_std::renderer::Quad;
 
 struct Line {