refactor

Author: jsjgdh

editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs

@@ -14,7 +14,7 @@ use graphene_std::Color;
 use graphene_std::renderer::Quad;
 use graphene_std::renderer::convert_usvg_path::{convert_tiny_skia_path, convert_usvg_path};
 use graphene_std::table::Table;
-use graphene_std::text::{Font, TextAnchor, TypesettingConfig};
+use graphene_std::text::{Font, TypesettingConfig};
 use graphene_std::vector::style::{Fill, Gradient, GradientStop, GradientStops, GradientType, PaintOrder, Stroke, StrokeAlign, StrokeCap, StrokeJoin};
 #[derive(ExtractField)]
 pub struct GraphOperationMessageContext<'a> {

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

@@ -4,7 +4,6 @@ use crate::messages::portfolio::document::utility_types::document_metadata::Laye
 use crate::messages::portfolio::document::utility_types::network_interface::{self, InputConnector, NodeNetworkInterface, OutputConnector};
 use crate::messages::prelude::*;
 use glam::{DAffine2, DVec2, IVec2};
-use graphene_std::transform::Transform as _;
 use graph_craft::document::value::TaggedValue;
 use graph_craft::document::{NodeId, NodeInput};
 use graph_craft::{ProtoNodeIdentifier, concrete};
@@ -15,6 +14,7 @@ use graphene_std::raster_types::{CPU, Raster};
 use graphene_std::subpath::Subpath;
 use graphene_std::table::Table;
 use graphene_std::text::{Font, TextAnchor, TypesettingConfig};
+use graphene_std::transform::Transform as _;
 use graphene_std::vector::Vector;
 use graphene_std::vector::style::{Fill, Stroke};
 use graphene_std::vector::{PointId, VectorModificationType};
@@ -290,8 +290,18 @@ impl<'a> ModifyInputsContext<'a> {
 		self.network_interface.move_node_to_chain_start(&fill_id, layer, &[], self.import);
 	}
 
-
-	pub fn insert_text_on_path(&mut self, text: String, font: Font, font_size: f64, character_spacing: f64, path_subpaths: Vec<Subpath<PointId>>, start_offset: f64, text_anchor: TextAnchor, transform: DAffine2, layer: LayerNodeIdentifier) {
+	pub fn insert_text_on_path(
+		&mut self,
+		text: String,
+		font: Font,
+		font_size: f64,
+		character_spacing: f64,
+		path_subpaths: Vec<Subpath<PointId>>,
+		start_offset: f64,
+		text_anchor: TextAnchor,
+		transform: DAffine2,
+		layer: LayerNodeIdentifier,
+	) {
 		use graphene_std::text::TextPathSide;
 
 		// Create the path vector object

node-graph/nodes/gstd/src/text.rs

@@ -1,8 +1,8 @@
 use core_types::{Ctx, table::Table};
 use graph_craft::wasm_application_io::WasmEditorApi;
 use graphic_types::Vector;
-pub use text_nodes::*;
 pub use text_nodes::text_on_path::{TextAnchor, TextPathSide};
+pub use text_nodes::*;
 
 /// Draws a text string as vector geometry with a choice of font and styling.
 #[node_macro::node(category("Text"))]
@@ -80,8 +80,7 @@ fn text<'i: 'n>(
 #[node_macro::node(category("Text"))]
 fn text_on_path<'i: 'n>(
 	_: impl Ctx,
-	#[scope("editor-api")]
-	editor_resources: &'i WasmEditorApi,
+	#[scope("editor-api")] editor_resources: &'i WasmEditorApi,
 	/// The text content to flow along the path.
 	#[default("Lorem ipsum")]
 	text: String,

node-graph/nodes/text/src/font_cache.rs

@@ -1,9 +1,9 @@
 use dyn_any::DynAny;
 use parley::fontique::Blob;
+use serde::Deserialize;
 use std::collections::HashMap;
 use std::hash::Hash;
 use std::sync::Arc;
-use serde::Deserialize;
 
 /// A font type (storing font family and font style and an optional preview URL)
 #[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
@@ -119,15 +119,15 @@ impl FontCache {
 		if self.font_file_data.contains_key(font) {
 			Some(font)
 		} else {
-			let fallback = self.font_file_data
+			let fallback = self
+				.font_file_data
 				.keys()
 				.find(|font| font.font_family == core_types::consts::DEFAULT_FONT_FAMILY && font.font_style == core_types::consts::DEFAULT_FONT_STYLE)
-				.or_else(|| self.font_file_data.keys().next());			
+				.or_else(|| self.font_file_data.keys().next());
 			fallback
 		}
 	}
 
-
 	/// Try to get the bytes for a font
 	pub fn get<'a>(&'a self, font: &'a Font) -> Option<(&'a Vec<u8>, &'a Font)> {
 		let resolved = self.resolve_font(font)?;

node-graph/nodes/text/src/lib.rs

@@ -1,8 +1,8 @@
 mod font_cache;
 mod path_builder;
 mod text_context;
-mod to_path;
 pub mod text_on_path;
+mod to_path;
 
 use dyn_any::DynAny;
 pub use font_cache::*;

node-graph/nodes/text/src/path_builder.rs

@@ -1,11 +1,11 @@
 use core_types::table::{Table, TableRow};
 use glam::{DAffine2, DVec2};
-use vector_types::{Subpath, Vector};
+use kurbo::{PathSeg, Point};
 use skrifa::instance::{NormalizedCoord, Size};
-use skrifa::outline::{OutlineGlyph, OutlinePen, DrawSettings};
+use skrifa::outline::{DrawSettings, OutlineGlyph, OutlinePen};
 use skrifa::raw::FontRef as ReadFontsRef;
 use skrifa::{GlyphId, MetadataProvider};
-use kurbo::{PathSeg, Point};
+use vector_types::{Subpath, Vector};
 
 pub struct PathBuilder<Upstream: Default + 'static> {
 	vector_table: Table<Vector<Upstream>>,
@@ -39,7 +39,7 @@ impl<Upstream: Default + 'static> PathBuilder<Upstream> {
 		self.glyph_subpaths.clear();
 		self.current_segments.clear();
 		self.current_point = Point::ZERO;
-		
+
 		let settings = DrawSettings::unhinted(Size::new(size), normalized_coords);
 		glyph.draw(settings, self).unwrap();
 
@@ -48,7 +48,11 @@ impl<Upstream: Default + 'static> PathBuilder<Upstream> {
 			self.current_segments.clear();
 		}
 
-		let transform = if self.is_text_on_path { final_transform } else { final_transform * DAffine2::from_scale(DVec2::splat(self.scale)) };
+		let transform = if self.is_text_on_path {
+			final_transform
+		} else {
+			final_transform * DAffine2::from_scale(DVec2::splat(self.scale))
+		};
 		let transform = if let Some(skew) = style_skew { transform * skew } else { transform };
 
 		let subpaths = std::mem::take(&mut self.glyph_subpaths);
@@ -88,14 +92,18 @@ impl<Upstream: Default + 'static> PathBuilder<Upstream> {
 
 			if let Some(glyph_outline) = outlines.get(GlyphId::from(glyph.id)) {
 				let final_transform = DAffine2::from_translation(glyph_offset);
-				if !per_glyph_instances { self.origin = DVec2::ZERO }
+				if !per_glyph_instances {
+					self.origin = DVec2::ZERO
+				}
 				self.draw_glyph(&glyph_outline, font_size, &normalized_coords, style_skew, final_transform, per_glyph_instances);
 			}
 		});
 	}
 
 	pub fn finalize(mut self) -> Table<Vector<Upstream>> {
-		if self.vector_table.is_empty() { self.vector_table = Table::new_from_element(Vector::default()) }
+		if self.vector_table.is_empty() {
+			self.vector_table = Table::new_from_element(Vector::default())
+		}
 		self.vector_table
 	}
 }

node-graph/nodes/text/src/text_on_path.rs

@@ -3,8 +3,8 @@ use dyn_any::DynAny;
 use glam::{DAffine2, DVec2};
 use kurbo::{BezPath, ParamCurve, ParamCurveArclen, ParamCurveDeriv, PathEl, PathSeg};
 use parley::PositionedLayoutItem;
-use skrifa::raw::FontRef as ReadFontsRef;
 use skrifa::MetadataProvider;
+use skrifa::raw::FontRef as ReadFontsRef;
 use vector_types::Vector;
 
 #[derive(Debug, Default, Clone, Copy, PartialEq, Hash, serde::Serialize, serde::Deserialize, DynAny, node_macro::ChoiceType)]
@@ -90,11 +90,7 @@ impl ArcLengthLut {
 		let (seg_idx1, t1) = self.params[next_idx];
 
 		// Interpolate t within the segment
-		let t = if seg_idx0 == seg_idx1 && (l1 - l0) > 1e-9 {
-			t0 + (t1 - t0) * (s - l0) / (l1 - l0)
-		} else {
-			t0
-		};
+		let t = if seg_idx0 == seg_idx1 && (l1 - l0) > 1e-9 { t0 + (t1 - t0) * (s - l0) / (l1 - l0) } else { t0 };
 
 		let seg = self.segs.get(seg_idx0)?;
 		let point = seg.eval(t);
@@ -233,7 +229,8 @@ pub fn place_text_on_path<Upstream: Default + 'static>(
 						let (point, angle) = if lut.is_closed { lut.at_or_zero(effective_mid) } else { at_with_extension(&lut, effective_mid) };
 
 						if let Some(glyph_outline) = outlines.get(skrifa::GlyphId::from(glyph.id)) {
-							let final_transform = DAffine2::from_translation(DVec2::new(point.x, point.y)) * DAffine2::from_angle(angle) * DAffine2::from_translation(DVec2::new(glyph.x as f64, -glyph.y as f64));
+							let final_transform =
+								DAffine2::from_translation(DVec2::new(point.x, point.y)) * DAffine2::from_angle(angle) * DAffine2::from_translation(DVec2::new(glyph.x as f64, -glyph.y as f64));
 							path_builder.draw_glyph(&glyph_outline, font_size, &normalized_coords, style_skew, final_transform, true);
 						}
 					}