Rename gradient type to gradient form (#4405)

* Rename gradient type to gradient form * Update the demo art for the gradient form rename * Say form not type in the Gradient Form node's doc comment
2026-09-18 07:48:02 +08:00 · 2026-08-04 05:51:10 -07:00
parent d5e31c23bb
commit b9a8065eb8
20 changed files with 174 additions and 191 deletions
--- a/editor/src/messages/portfolio/document/data_panel/data_panel_message_handler.rs
+++ b/editor/src/messages/portfolio/document/data_panel/data_panel_message_handler.rs
@@ -23,7 +23,7 @@ use graphene_std::transform::{ReferencePoint, ScaleType};
 use graphene_std::vector::misc::{
 	ArcType, BooleanOperation, BoxCorners, CentroidType, ExtrudeJoiningAlgorithm, GridType, InterpolationDistribution, MergeByDistanceAlgorithm, PointSpacingType, RowsOrColumns, SpiralType,
 };
-use graphene_std::vector::style::{DashPattern, FillChoice, GradientRamp, GradientSpread, GradientType, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin};
+use graphene_std::vector::style::{DashPattern, FillChoice, GradientForm, GradientRamp, GradientSpread, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin};
 use graphene_std::vector::{QRCodeErrorCorrectionLevel, Vector};
 use graphene_std::{Artboard, Color, Graphic};
 use std::any::Any;
@@ -216,7 +216,7 @@ fn generate_layout(introspected_data: &Arc<dyn std::any::Any + Send + Sync + 'st
 		List<DVec2>,
 		List<DAffine2>,
 		List<BlendMode>,
-		List<GradientType>,
+		List<GradientForm>,
 		List<GradientSpread>,
 		List<DashPattern>,
 		List<BoxCorners>,
@@ -269,7 +269,7 @@ fn generate_layout(introspected_data: &Arc<dyn std::any::Any + Send + Sync + 'st
 		DVec2,
 		DAffine2,
 		BlendMode,
-		GradientType,
+		GradientForm,
 		GradientSpread,
 		DashPattern,
 		BoxCorners,
@@ -1007,7 +1007,7 @@ macro_rules! impl_table_item_layout_for_choice_enum {
 }
 impl_table_item_layout_for_choice_enum!(
 	BlendMode,
-	GradientType,
+	GradientForm,
 	GradientSpread,
 	StrokeJoin,
 	StrokeAlign,
@@ -1219,7 +1219,7 @@ macro_rules! known_item_types {
 			DashPattern,
 			BoxCorners,
 			BlendMode,
-			GradientType,
+			GradientForm,
 			GradientSpread,
 			StrokeJoin,
 			StrokeAlign,
--- a/editor/src/messages/portfolio/document/graph_operation/graph_operation_message.rs
+++ b/editor/src/messages/portfolio/document/graph_operation/graph_operation_message.rs
@@ -10,7 +10,7 @@ use graphene_std::raster::BlendMode;
 use graphene_std::raster_types::Image;
 use graphene_std::subpath::Subpath;
 use graphene_std::text::{Font, TypesettingConfig};
-use graphene_std::vector::style::{GradientSpread, GradientType, Stroke};
+use graphene_std::vector::style::{GradientForm, GradientSpread, Stroke};
 use graphene_std::vector::{Gradient, PointId, VectorModificationType};

 #[impl_message(Message, DocumentMessage, GraphOperation)]
@@ -24,7 +24,7 @@ pub enum GraphOperationMessage {
 		layer: LayerNodeIdentifier,
 		#[serde(skip)]
 		gradient: Gradient,
-		gradient_type: GradientType,
+		gradient_form: GradientForm,
 		gradient_spread: GradientSpread,
 		transform: DAffine2,
 	},
@@ -49,9 +49,9 @@ pub enum GraphOperationMessage {
 		layer: LayerNodeIdentifier,
 		transform: DAffine2,
 	},
-	GradientTypeSet {
+	GradientFormSet {
 		layer: LayerNodeIdentifier,
-		gradient_type: GradientType,
+		gradient_form: GradientForm,
 	},
 	GradientSpreadSet {
 		layer: LayerNodeIdentifier,
--- a/editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs
+++ b/editor/src/messages/portfolio/document/graph_operation/graph_operation_message_handler.rs
@@ -14,7 +14,7 @@ use graph_craft::document::{NodeId, NodeInput};
 use graphene_std::list::List;
 use graphene_std::renderer::convert_usvg_path::convert_usvg_path;
 use graphene_std::text::{Font, TypesettingConfig};
-use graphene_std::vector::style::{Gradient, GradientSpread, GradientStop, GradientType, PaintOrder, Stroke, StrokeAlign, StrokeCap, StrokeJoin};
+use graphene_std::vector::style::{Gradient, GradientForm, GradientSpread, GradientStop, PaintOrder, Stroke, StrokeAlign, StrokeCap, StrokeJoin};
 use graphene_std::{Artboard, Color};

 #[derive(ExtractField)]
@@ -43,12 +43,12 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
 			GraphOperationMessage::FillGradientSet {
 				layer,
 				gradient,
-				gradient_type,
+				gradient_form,
 				gradient_spread,
 				transform,
 			} => {
 				if let Some(mut modify_inputs) = ModifyInputsContext::new_with_layer(layer, network_interface, responses) {
-					modify_inputs.fill_gradient_set(gradient, gradient_type, gradient_spread, transform);
+					modify_inputs.fill_gradient_set(gradient, gradient_form, gradient_spread, transform);
 				}
 			}
 			GraphOperationMessage::BlendingFillSet { layer, fill } => {
@@ -76,9 +76,9 @@ impl MessageHandler<GraphOperationMessage, GraphOperationMessageContext<'_>> for
 					modify_inputs.gradient_transform_set(transform);
 				}
 			}
-			GraphOperationMessage::GradientTypeSet { layer, gradient_type } => {
+			GraphOperationMessage::GradientFormSet { layer, gradient_form } => {
 				if let Some(mut modify_inputs) = ModifyInputsContext::new_with_layer(layer, network_interface, responses) {
-					modify_inputs.gradient_type_set(gradient_type);
+					modify_inputs.gradient_form_set(gradient_form);
 				}
 			}
 			GraphOperationMessage::GradientSpreadSet { layer, gradient_spread } => {
@@ -824,7 +824,7 @@ fn apply_usvg_fill(fill: &usvg::Fill, modify_inputs: &mut ModifyInputsContext, g
 			let direction = end - start;
 			let transform = DAffine2::from_cols(direction, direction.perp(), start);

-			let gradient_type = GradientType::Linear;
+			let gradient_form = GradientForm::Linear;

 			let gradient = match graphite_gradient_stops.get(linear.id()) {
 				Some(graphite_stops) => graphite_stops.clone(),
@@ -838,7 +838,7 @@ fn apply_usvg_fill(fill: &usvg::Fill, modify_inputs: &mut ModifyInputsContext, g
 				}
 			};
 			let gradient_spread = convert_gradient_spread(linear.spread_method());
-			modify_inputs.fill_gradient_set(gradient, gradient_type, gradient_spread, transform);
+			modify_inputs.fill_gradient_set(gradient, gradient_form, gradient_spread, transform);
 		}
 		usvg::Paint::RadialGradient(radial) => {
 			let gradient_transform = usvg_transform(radial.transform());
@@ -848,7 +848,7 @@ fn apply_usvg_fill(fill: &usvg::Fill, modify_inputs: &mut ModifyInputsContext, g
 			let direction = end - start;
 			let transform = DAffine2::from_cols(direction, direction.perp(), start);

-			let gradient_type = GradientType::Radial;
+			let gradient_form = GradientForm::Radial;

 			let gradient = match graphite_gradient_stops.get(radial.id()) {
 				Some(graphite_stops) => graphite_stops.clone(),
@@ -863,7 +863,7 @@ fn apply_usvg_fill(fill: &usvg::Fill, modify_inputs: &mut ModifyInputsContext, g
 			};
 			let gradient_spread = convert_gradient_spread(radial.spread_method());

-			modify_inputs.fill_gradient_set(gradient, gradient_type, gradient_spread, transform);
+			modify_inputs.fill_gradient_set(gradient, gradient_form, gradient_spread, transform);
 		}
 		usvg::Paint::Pattern(_) => warn!("SVG patterns are not currently supported"),
 	};
--- a/editor/src/messages/portfolio/document/graph_operation/utility_types.rs
+++ b/editor/src/messages/portfolio/document/graph_operation/utility_types.rs
@@ -17,7 +17,7 @@ use graphene_std::raster::BlendMode;
 use graphene_std::raster_types::Image;
 use graphene_std::subpath::Subpath;
 use graphene_std::text::{Font, TypesettingConfig};
-use graphene_std::vector::style::{GradientSpread, GradientType, Stroke};
+use graphene_std::vector::style::{GradientForm, GradientSpread, Stroke};
 use graphene_std::vector::{Gradient, GradientRamp, PointId, Vector, VectorModification, VectorModificationType};
 use graphene_std::{Artboard, Color, Graphic};

@@ -404,7 +404,7 @@ impl<'a> ModifyInputsContext<'a> {
 		self.set_input_with_refresh(input_connector, NodeInput::value(fill_value, false), false);
 	}

-	pub fn fill_gradient_set(&mut self, gradient: Gradient, gradient_type: GradientType, gradient_spread: GradientSpread, transform: DAffine2) {
+	pub fn fill_gradient_set(&mut self, gradient: Gradient, gradient_form: GradientForm, gradient_spread: GradientSpread, transform: DAffine2) {
 		let Some(fill_node_id) = self.existing_proto_node_id(graphene_std::vector_nodes::fill::IDENTIFIER, true) else {
 			return;
 		};
@@ -443,8 +443,8 @@ impl<'a> ModifyInputsContext<'a> {
 		}

 		self.set_input_with_refresh(
-			InputConnector::node(fill_node_id, graphene_std::vector::fill::GradientTypeInput),
-			NodeInput::value(TaggedValue::GradientType(gradient_type), false),
+			InputConnector::node(fill_node_id, graphene_std::vector::fill::GradientFormInput),
+			NodeInput::value(TaggedValue::GradientForm(gradient_form), false),
 			false,
 		);
 	}
@@ -661,20 +661,20 @@ impl<'a> ModifyInputsContext<'a> {
 		self.responses.add(NodeGraphMessage::RunDocumentGraph);
 	}

-	/// Write the gradient type to the last 'Gradient Type' node in the chain, inserting one only when the value differs
+	/// Write the Gradient Form to the last 'Gradient Form' node in the chain, inserting one only when the value differs
 	/// from the default (`Linear`).
-	pub fn gradient_type_set(&mut self, gradient_type: GradientType) {
+	pub fn gradient_form_set(&mut self, gradient_form: GradientForm) {
 		let Some(output_layer) = self.get_output_layer() else { return };

 		let target_input = gradient_chain_target_input(output_layer, self.network_interface);
-		let identifier = graphene_std::math_nodes::gradient_type::IDENTIFIER;
-		let create_if_nonexistent = gradient_type != GradientType::default();
+		let identifier = graphene_std::math_nodes::gradient_form::IDENTIFIER;
+		let create_if_nonexistent = gradient_form != GradientForm::default();
 		let Some(node_id) = self.existing_proto_node_id_at(&target_input, identifier, create_if_nonexistent) else {
 			return;
 		};

-		let input_connector = InputConnector::node(node_id, graphene_std::math_nodes::gradient_type::GradientTypeInput);
-		self.set_input_with_refresh(input_connector, NodeInput::value(TaggedValue::GradientType(gradient_type), false), false);
+		let input_connector = InputConnector::node(node_id, graphene_std::math_nodes::gradient_form::GradientFormInput);
+		self.set_input_with_refresh(input_connector, NodeInput::value(TaggedValue::GradientForm(gradient_form), false), false);
 	}

 	/// Write the gradient spread to the last 'Gradient Spread' node in the chain, inserting one only when the value differs
--- a/editor/src/messages/portfolio/document/node_graph/node_properties.rs
+++ b/editor/src/messages/portfolio/document/node_graph/node_properties.rs
@@ -34,7 +34,7 @@ use graphene_std::vector::misc::{
 	ArcType, BoxCorners, CentroidType, ExtrudeJoiningAlgorithm, GridType, InterpolationDistribution, MergeByDistanceAlgorithm, PointSpacingType, RowsOrColumns, SpiralType,
 };
 use graphene_std::vector::style::{
-	FillChoice, Gradient, GradientRamp, GradientSpread, GradientStops, GradientType, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin, build_transform_with_y_preservation,
+	FillChoice, Gradient, GradientForm, GradientRamp, GradientSpread, GradientStops, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin, build_transform_with_y_preservation,
 };
 use graphene_std::vector::{QRCodeErrorCorrectionLevel, VectorModification};
 use graphene_std::{NodeParameter, ParameterRef};
@@ -292,7 +292,7 @@ pub(crate) fn property_from_type(
 						// =========================
 						// AUTO-GENERATED ENUM TYPES
 						// =========================
-						Some(x) if id_is::<GradientType>(x) => enum_choice::<GradientType>().for_socket(default_info).property_row(),
+						Some(x) if id_is::<GradientForm>(x) => enum_choice::<GradientForm>().for_socket(default_info).property_row(),
 						Some(x) if id_is::<GradientSpread>(x) => enum_choice::<GradientSpread>().for_socket(default_info).property_row(),
 						Some(x) if id_is::<RealTimeMode>(x) => enum_choice::<RealTimeMode>().for_socket(default_info).property_row(),
 						Some(x) if id_is::<RedGreenBlue>(x) => enum_choice::<RedGreenBlue>().for_socket(default_info).property_row(),
@@ -2402,7 +2402,7 @@ pub(crate) fn fill_properties(node_id: NodeId, context: &mut NodePropertiesConte
 		Solid(Option<Color>),
 		Gradient {
 			gradient: Gradient,
-			gradient_type: GradientType,
+			gradient_form: GradientForm,
 			gradient_spread: GradientSpread,
 			transform: DAffine2,
 			/// Whether the transform input holds a plain value (so the "Reverse Direction" button may write to it) rather than a wire.
@@ -2432,7 +2432,7 @@ pub(crate) fn fill_properties(node_id: NodeId, context: &mut NodePropertiesConte
 				}) {
 					Some(gradient) => ResolvedFill::Gradient {
 						gradient: gradient.stops,
-						gradient_type: gradient.gradient_type,
+						gradient_form: gradient.gradient_form,
 						gradient_spread: gradient.gradient_spread,
 						transform: gradient.transform,
 						transform_is_value: gradient.transform_is_value,
@@ -2584,7 +2584,7 @@ pub(crate) fn fill_properties(node_id: NodeId, context: &mut NodePropertiesConte
 	widgets.push(fill_type_switch);

 	if let ResolvedFill::Gradient {
-		gradient_type,
+		gradient_form,
 		transform,
 		transform_is_value,
 		..
@@ -2603,7 +2603,7 @@ pub(crate) fn fill_properties(node_id: NodeId, context: &mut NodePropertiesConte

 			let reverse_direction_button = IconButton::new(if orientation_rightward { "ReverseRadialGradientToRight" } else { "ReverseRadialGradientToLeft" }, 24)
 				.tooltip_label("Reverse Direction")
-				.tooltip_description(graph_modification_utils::reverse_direction_tooltip_description(gradient_type))
+				.tooltip_description(graph_modification_utils::reverse_direction_tooltip_description(gradient_form))
 				.on_update(move |_| Message::Batched {
 					messages: Box::new([
 						NodeGraphMessage::SetInputValue {
@@ -2627,19 +2627,19 @@ pub(crate) fn fill_properties(node_id: NodeId, context: &mut NodePropertiesConte
 			add_blank_assist(&mut row);
 		}

-		let entries = [GradientType::Linear, GradientType::Radial]
+		let entries = [GradientForm::Linear, GradientForm::Radial]
 			.iter()
-			.map(|&gradient_type| {
-				RadioEntryData::new(format!("{:?}", gradient_type))
-					.label(format!("{:?}", gradient_type))
-					.on_update(update_value(move |_| TaggedValue::GradientType(gradient_type), node_id, GradientTypeInput))
+			.map(|&gradient_form| {
+				RadioEntryData::new(format!("{:?}", gradient_form))
+					.label(format!("{:?}", gradient_form))
+					.on_update(update_value(move |_| TaggedValue::GradientForm(gradient_form), node_id, GradientFormInput))
 					.on_commit(commit_value)
 			})
 			.collect();

 		row.extend_from_slice(&[
 			Separator::new(SeparatorStyle::Unrelated).widget_instance(),
-			RadioInput::new(entries).selected_index(Some(gradient_type as u32)).widget_instance(),
+			RadioInput::new(entries).selected_index(Some(gradient_form as u32)).widget_instance(),
 		]);

 		widgets.push(LayoutGroup::row(row));
--- a/editor/src/messages/portfolio/document_migration.rs
+++ b/editor/src/messages/portfolio/document_migration.rs
@@ -269,6 +269,10 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
 		node: graphene_std::math_nodes::footprint_value::IDENTIFIER,
 		aliases: &["graphene_math_nodes::FootprintValueNode", "graphene_core::ops::FootprintValueNode"],
 	},
+	NodeReplacement {
+		node: graphene_std::math_nodes::gradient_form::IDENTIFIER,
+		aliases: &["math_nodes::GradientTypeNode"],
+	},
 	NodeReplacement {
 		node: graphene_std::math_nodes::gradient_spread::IDENTIFIER,
 		aliases: &["math_nodes::SpreadMethodNode"],
@@ -1673,7 +1677,7 @@ fn migrate_node(node_id: &NodeId, node: &DocumentNode, network_path: &[NodeId],
 	}

 	// Upgrade the legacy 4-input Fill node (content, fill: Fill, _backup_color, _backup_gradient: Gradient) to the value-model
-	// 7-input shape (content, fill: generic paint list, _backup_color, _backup_gradient, _gradient_type, _has_transform, _transform).
+	// 7-input shape (content, fill: generic paint list, _backup_color, _backup_gradient, _gradient_form, _has_transform, _transform).
 	if reference == DefinitionIdentifier::ProtoNode(graphene_std::vector_nodes::fill::IDENTIFIER) && inputs_count == 4 {
 		let mut node_template = resolve_document_node_type(&reference)?.default_node_template();
 		document.network_interface.replace_implementation(node_id, network_path, &mut node_template);
@@ -1702,7 +1706,7 @@ fn migrate_node(node_id: &NodeId, node: &DocumentNode, network_path: &[NodeId],
 				if let graphic_types::migrations::legacy::LegacyFill::Gradient(gradient) = old_fill {
 					document.network_interface.set_input(
 						&InputConnector::node_at_index(*node_id, 4),
-						NodeInput::value(TaggedValue::GradientType(gradient.gradient_type), false),
+						NodeInput::value(TaggedValue::GradientForm(gradient.gradient_type), false),
 						network_path,
 					);

@@ -1754,7 +1758,7 @@ fn migrate_node(node_id: &NodeId, node: &DocumentNode, network_path: &[NodeId],
 			) {
 				document.network_interface.set_input(
 					&InputConnector::node_at_index(*node_id, 4),
-					NodeInput::value(TaggedValue::GradientType(g.gradient_type), false),
+					NodeInput::value(TaggedValue::GradientForm(g.gradient_type), false),
 					network_path,
 				);

--- a/editor/src/messages/tool/common_functionality/graph_modification_utils.rs
+++ b/editor/src/messages/tool/common_functionality/graph_modification_utils.rs
@@ -14,7 +14,7 @@ use graphene_std::subpath::Subpath;
 use graphene_std::text::{Font, TypesettingConfig};
 use graphene_std::vector::misc::ManipulatorPointId;
 use graphene_std::vector::style::{FillChoice, PaintOrder, StrokeAlign, StrokeCap, StrokeJoin, initial_gradient_transform_for_bounding_box};
-use graphene_std::vector::{Gradient, GradientSpread, GradientType, PointId, SegmentId, VectorModificationType};
+use graphene_std::vector::{Gradient, GradientForm, GradientSpread, PointId, SegmentId, VectorModificationType};
 use graphene_std::{NodeParameter, ParameterRef};
 use std::collections::VecDeque;

@@ -381,11 +381,11 @@ pub fn gradient_space_transform(layer: LayerNodeIdentifier, network_interface: &
 	metadata.transform_to_viewport(layer)
 }

-/// Tooltip description for a "Reverse Direction" gradient button, phrased for the given gradient type.
-pub fn reverse_direction_tooltip_description(gradient_type: GradientType) -> &'static str {
-	match gradient_type {
-		GradientType::Radial => "Reverse which end the gradient radiates from.",
-		GradientType::Linear => "Swap the start and end points of the gradient line.",
+/// Tooltip description for a "Reverse Direction" gradient button, phrased for the given Gradient Form.
+pub fn reverse_direction_tooltip_description(gradient_form: GradientForm) -> &'static str {
+	match gradient_form {
+		GradientForm::Radial => "Reverse which end the gradient radiates from.",
+		GradientForm::Linear => "Swap the start and end points of the gradient line.",
 	}
 }

@@ -659,7 +659,7 @@ pub fn set_stroke_weight_for_selected_layers(weight: f64, document: &DocumentMes
 /// A Fill node's decoded gradient inputs, with the transform kept in its raw form (not yet baked into `start`/`end`).
 pub struct FillNodeGradient {
 	pub stops: Gradient,
-	pub gradient_type: GradientType,
+	pub gradient_form: GradientForm,
 	pub gradient_spread: GradientSpread,
 	pub transform: DAffine2,
 	/// Whether the transform input holds a plain value (so it may be written to) rather than a wire.
@@ -675,9 +675,9 @@ pub fn read_fill_node_gradient(fill_node: &DocumentNode, bounding_box: impl FnOn
 	};
 	let gradient_spread = ramp.gradient_spread;
 	let stops = Gradient::from(ramp);
-	let gradient_type = match fill_node.input(fill::GradientTypeInput).and_then(|input| input.as_value()) {
-		Some(&TaggedValue::GradientType(value)) => value,
-		_ => GradientType::default(),
+	let gradient_form = match fill_node.input(fill::GradientFormInput).and_then(|input| input.as_value()) {
+		Some(&TaggedValue::GradientForm(value)) => value,
+		_ => GradientForm::default(),
 	};
 	let has_transform = matches!(fill_node.input(fill::HasTransformInput).and_then(|input| input.as_value()), Some(&TaggedValue::Bool(true)));
 	let transform_input = fill_node.input(fill::TransformInput).and_then(|input| input.as_value());
@@ -689,7 +689,7 @@ pub fn read_fill_node_gradient(fill_node: &DocumentNode, bounding_box: impl FnOn

 	Some(FillNodeGradient {
 		stops,
-		gradient_type,
+		gradient_form,
 		gradient_spread,
 		transform,
 		transform_is_value: transform_input.is_some(),
@@ -824,9 +824,9 @@ pub fn set_fill_for_selected_layers(fill_choice: FillChoice, document: &Document
 				use graphene_std::vector::fill;
 				let fill_parameters = NodeGraphLayer::new(layer, &document.network_interface).find_node_parameters(fill::IDENTIFIER);

-				let gradient_type = match fill_parameters.as_ref().and_then(|parameters| parameters.value(fill::GradientTypeInput)) {
-					Some(TaggedValue::GradientType(value)) => *value,
-					_ => GradientType::default(),
+				let gradient_form = match fill_parameters.as_ref().and_then(|parameters| parameters.value(fill::GradientFormInput)) {
+					Some(TaggedValue::GradientForm(value)) => *value,
+					_ => GradientForm::default(),
 				};
 				let has_transform = matches!(fill_parameters.as_ref().and_then(|parameters| parameters.value(fill::HasTransformInput)), Some(TaggedValue::Bool(true)));
 				let transform = match (has_transform, fill_parameters.as_ref().and_then(|parameters| parameters.value(fill::TransformInput))) {
@@ -838,7 +838,7 @@ pub fn set_fill_for_selected_layers(fill_choice: FillChoice, document: &Document
 				responses.add(GraphOperationMessage::FillGradientSet {
 					layer,
 					gradient: Gradient::from(ramp),
-					gradient_type,
+					gradient_form,
 					gradient_spread: ramp.gradient_spread,
 					transform,
 				});
--- a/editor/src/messages/tool/tool_messages/gradient_tool.rs
+++ b/editor/src/messages/tool/tool_messages/gradient_tool.rs
@@ -16,7 +16,7 @@ use glam::DMat2;
 use graph_craft::document::value::TaggedValue;
 use graphene_std::color::SRGBA8;
 use graphene_std::raster::color::Color;
-use graphene_std::vector::style::{FillChoice, Gradient, GradientRamp, GradientSpread, GradientStop, GradientType, build_transform_with_y_preservation};
+use graphene_std::vector::style::{FillChoice, Gradient, GradientForm, GradientRamp, GradientSpread, GradientStop, build_transform_with_y_preservation};

 #[derive(Default, ExtractField)]
 pub struct GradientTool {
@@ -27,7 +27,7 @@ pub struct GradientTool {

 #[derive(Default)]
 pub struct GradientOptions {
-	gradient_type: GradientType,
+	gradient_form: GradientForm,
 	gradient_spread: GradientSpread,
 }

@@ -60,7 +60,7 @@ pub enum GradientToolMessage {
 #[cfg_attr(feature = "wasm", derive(tsify::Tsify))]
 #[derive(PartialEq, Eq, Clone, Debug, Hash, serde::Serialize, serde::Deserialize)]
 pub enum GradientOptionsUpdate {
-	Type(GradientType),
+	Form(GradientForm),
 	ReverseStops,
 	ReverseDirection,
 }
@@ -82,14 +82,14 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Grad
 	fn process_message(&mut self, message: ToolMessage, responses: &mut VecDeque<Message>, context: &mut ToolActionMessageContext<'a>) {
 		match message {
 			ToolMessage::Gradient(GradientToolMessage::UpdateOptions { options }) => match options {
-				GradientOptionsUpdate::Type(gradient_type) => {
-					self.options.gradient_type = gradient_type;
+				GradientOptionsUpdate::Form(gradient_form) => {
+					self.options.gradient_form = gradient_form;
 					apply_gradient_update(
 						&mut self.data,
 						context,
 						responses,
-						|(_gradient, appearance)| appearance.gradient_type != gradient_type,
-						|(_gradient, appearance)| appearance.gradient_type = gradient_type,
+						|(_gradient, appearance)| appearance.gradient_form != gradient_form,
+						|(_gradient, appearance)| appearance.gradient_form = gradient_form,
 					);
 					responses.add(ToolMessage::UpdateHints);
 					responses.add(ToolMessage::UpdateCursor);
@@ -167,8 +167,8 @@ impl<'a> MessageHandler<ToolMessage, &mut ToolActionMessageContext<'a>> for Grad

 				let mut needs_refresh = false;
 				if let Some((_gradient, appearance)) = &current_gradient {
-					if self.options.gradient_type != appearance.gradient_type {
-						self.options.gradient_type = appearance.gradient_type;
+					if self.options.gradient_form != appearance.gradient_form {
+						self.options.gradient_form = appearance.gradient_form;
 						needs_refresh = true;
 					}
 					if self.options.gradient_spread != appearance.gradient_spread {
@@ -230,21 +230,21 @@ impl LayoutHolder for GradientTool {
 	fn layout(&self) -> Layout {
 		let mut widgets: Vec<WidgetInstance> = Vec::new();

-		let gradient_type = RadioInput::new(vec![
+		let gradient_form = RadioInput::new(vec![
 			RadioEntryData::new("Linear").label("Linear").tooltip_label("Linear Gradient").on_update(move |_| {
 				GradientToolMessage::UpdateOptions {
-					options: GradientOptionsUpdate::Type(GradientType::Linear),
+					options: GradientOptionsUpdate::Form(GradientForm::Linear),
 				}
 				.into()
 			}),
 			RadioEntryData::new("Radial").label("Radial").tooltip_label("Radial Gradient").on_update(move |_| {
 				GradientToolMessage::UpdateOptions {
-					options: GradientOptionsUpdate::Type(GradientType::Radial),
+					options: GradientOptionsUpdate::Form(GradientForm::Radial),
 				}
 				.into()
 			}),
 		])
-		.selected_index(Some((self.options.gradient_type == GradientType::Radial) as u32))
+		.selected_index(Some((self.options.gradient_form == GradientForm::Radial) as u32))
 		.widget_instance();

 		// Display priority: the selected layer's stops, then any user-customized tool default, then the working colors
@@ -296,7 +296,7 @@ impl LayoutHolder for GradientTool {
 		};
 		let reverse_direction = IconButton::new(reverse_direction_icon, 24)
 			.tooltip_label("Reverse Direction")
-			.tooltip_description(reverse_direction_tooltip_description(self.options.gradient_type))
+			.tooltip_description(reverse_direction_tooltip_description(self.options.gradient_form))
 			.disabled(!self.data.has_selected_gradient)
 			.on_update(|_| {
 				GradientToolMessage::UpdateOptions {
@@ -311,7 +311,7 @@ impl LayoutHolder for GradientTool {
 			Separator::new(SeparatorStyle::Related).widget_instance(),
 			reverse_stops,
 			Separator::new(SeparatorStyle::Unrelated).widget_instance(),
-			gradient_type,
+			gradient_form,
 			Separator::new(SeparatorStyle::Related).widget_instance(),
 			reverse_direction,
 		]);
@@ -362,7 +362,7 @@ fn resolve_gradient(layer: LayerNodeIdentifier, network_interface: &NodeNetworkI
 			return Some((
 				gradient.stops,
 				GradientAppearance {
-					gradient_type: gradient.gradient_type,
+					gradient_form: gradient.gradient_form,
 					gradient_spread: gradient.gradient_spread,
 					transform: gradient.transform,
 				},
@@ -381,7 +381,7 @@ fn resolve_gradient(layer: LayerNodeIdentifier, network_interface: &NodeNetworkI
 #[derive(Clone, Copy, Debug, Default)]
 struct GradientAppearance {
 	transform: DAffine2,
-	gradient_type: GradientType,
+	gradient_form: GradientForm,
 	gradient_spread: GradientSpread,
 }

@@ -392,11 +392,11 @@ fn read_gradient_chain_state(layer: LayerNodeIdentifier, network_interface: &Nod
 	let walk_from = network_interface.upstream_output_connector(&target_input, &[]).and_then(|out| out.node_id()).unwrap_or(layer.to_node());

 	let transform_reference = DefinitionIdentifier::ProtoNode(graphene_std::transform_nodes::transform::IDENTIFIER);
-	let gradient_type_reference = DefinitionIdentifier::ProtoNode(graphene_std::math_nodes::gradient_type::IDENTIFIER);
+	let gradient_form_reference = DefinitionIdentifier::ProtoNode(graphene_std::math_nodes::gradient_form::IDENTIFIER);
 	let gradient_spread_reference = DefinitionIdentifier::ProtoNode(graphene_std::math_nodes::gradient_spread::IDENTIFIER);

 	let mut transforms_downstream_to_upstream: Vec<DAffine2> = Vec::new();
-	let mut gradient_type: Option<GradientType> = None;
+	let mut gradient_form: Option<GradientForm> = None;
 	let mut gradient_spread: Option<GradientSpread> = None;

 	for node_id in network_interface
@@ -411,11 +411,11 @@ fn read_gradient_chain_state(layer: LayerNodeIdentifier, network_interface: &Nod

 		if reference == transform_reference {
 			transforms_downstream_to_upstream.push(read_transform_node_value(&document_node.inputs));
-		} else if reference == gradient_type_reference
-			&& gradient_type.is_none()
-			&& let Some(TaggedValue::GradientType(value)) = document_node.inputs.get(1).and_then(|input| input.as_value())
+		} else if reference == gradient_form_reference
+			&& gradient_form.is_none()
+			&& let Some(TaggedValue::GradientForm(value)) = document_node.inputs.get(1).and_then(|input| input.as_value())
 		{
-			gradient_type = Some(*value);
+			gradient_form = Some(*value);
 		} else if reference == gradient_spread_reference
 			&& gradient_spread.is_none()
 			&& let Some(TaggedValue::GradientSpread(value)) = document_node.inputs.get(1).and_then(|input| input.as_value())
@@ -429,7 +429,7 @@ fn read_gradient_chain_state(layer: LayerNodeIdentifier, network_interface: &Nod

 	GradientAppearance {
 		transform: composed_transform,
-		gradient_type: gradient_type.unwrap_or_default(),
+		gradient_form: gradient_form.unwrap_or_default(),
 		gradient_spread: gradient_spread.unwrap_or_default(),
 	}
 }
@@ -552,7 +552,7 @@ impl SelectedGradient {
 		responses: &mut VecDeque<Message>,
 		snap_rotate: bool,
 		lock_angle: bool,
-		gradient_type: GradientType,
+		gradient_form: GradientForm,
 		drag_start: DVec2,
 		snap_data: SnapData,
 		snap_manager: &mut SnapManager,
@@ -565,7 +565,7 @@ impl SelectedGradient {
 			return;
 		}

-		self.appearance.gradient_type = gradient_type;
+		self.appearance.gradient_form = gradient_form;

 		let anchor_point = || {
 			let (start, end) = self.viewport_handle_positions();
@@ -765,7 +765,7 @@ impl SelectedGradient {
 				responses.add(GraphOperationMessage::FillGradientSet {
 					layer,
 					gradient: self.gradient.clone(),
-					gradient_type: self.appearance.gradient_type,
+					gradient_form: self.appearance.gradient_form,
 					gradient_spread: self.appearance.gradient_spread,
 					transform: self.appearance.transform,
 				});
@@ -797,9 +797,9 @@ fn dispatch_gradient_chain_writes(layer: LayerNodeIdentifier, gradient: &Gradien
 		layer,
 		transform: appearance.transform,
 	});
-	responses.add(GraphOperationMessage::GradientTypeSet {
+	responses.add(GraphOperationMessage::GradientFormSet {
 		layer,
-		gradient_type: appearance.gradient_type,
+		gradient_form: appearance.gradient_form,
 	});
 	responses.add(GraphOperationMessage::GradientSpreadSet {
 		layer,
@@ -808,9 +808,9 @@ fn dispatch_gradient_chain_writes(layer: LayerNodeIdentifier, gradient: &Gradien
 }

 impl GradientTool {
-	/// Get the gradient type of the selected gradient (if it exists)
-	pub fn selected_gradient(&self) -> Option<GradientType> {
-		self.data.selected_gradient.as_ref().map(|selected| selected.appearance.gradient_type)
+	/// Get the Gradient Form of the selected gradient (if it exists)
+	pub fn selected_gradient(&self) -> Option<GradientForm> {
+		self.data.selected_gradient.as_ref().map(|selected| selected.appearance.gradient_form)
 	}
 }

@@ -1482,7 +1482,7 @@ impl Fsm for GradientToolFsmState {
 								]),
 								GradientAppearance {
 									transform: DAffine2::IDENTITY,
-									gradient_type: tool_options.gradient_type,
+									gradient_form: tool_options.gradient_form,
 									gradient_spread: tool_options.gradient_spread,
 								},
 								GradientSource::Direct,
@@ -1533,7 +1533,7 @@ impl Fsm for GradientToolFsmState {
 						responses,
 						input.keyboard.get(constrain_axis as usize),
 						input.keyboard.get(lock_angle as usize),
-						selected_gradient.appearance.gradient_type,
+						selected_gradient.appearance.gradient_form,
 						drag_start_viewport,
 						snap_data,
 						&mut tool_data.snap_manager,
@@ -1835,7 +1835,7 @@ fn apply_gradient_update(
 				responses.add(GraphOperationMessage::FillGradientSet {
 					layer,
 					gradient,
-					gradient_type: appearance.gradient_type,
+					gradient_form: appearance.gradient_form,
 					gradient_spread: appearance.gradient_spread,
 					transform: appearance.transform,
 				});
@@ -1882,7 +1882,7 @@ fn apply_stops_update(data: &mut GradientToolData, context: &mut ToolActionMessa
 			responses.add(GraphOperationMessage::FillGradientSet {
 				layer,
 				gradient: new_gradient.clone(),
-				gradient_type: appearance.gradient_type,
+				gradient_form: appearance.gradient_form,
 				gradient_spread,
 				transform: appearance.transform,
 			});