Remove FillType::None for the fill node (#1572)

* Remove FillType::None for the fill node

* Fix demo art

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

@@ -348,8 +348,7 @@ impl<'a> ModifyInputsContext<'a> {
 	fn fill_set(&mut self, fill: Fill) {
 		self.modify_inputs("Fill", false, |inputs, _node_id, _metadata| {
 			let fill_type = match fill {
-				Fill::None => FillType::None,
+				Fill::None | Fill::Solid(_) => FillType::Solid,
-				Fill::Solid(_) => FillType::Solid,
 				Fill::Gradient(_) => FillType::Gradient,
 			};
 			inputs[1] = NodeInput::value(TaggedValue::FillType(fill_type), false);

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/document_node_types.rs

@@ -2574,7 +2574,7 @@ fn static_nodes() -> Vec<DocumentNodeDefinition> {
 			implementation: NodeImplementation::proto("graphene_core::vector::SetFillNode<_, _, _, _, _, _, _>"),
 			inputs: vec![
 				DocumentInputType::value("Vector Data", TaggedValue::VectorData(graphene_core::vector::VectorData::empty()), true),
-				DocumentInputType::value("Fill Type", TaggedValue::FillType(vector::style::FillType::None), false),
+				DocumentInputType::value("Fill Type", TaggedValue::FillType(vector::style::FillType::Solid), false),
 				DocumentInputType::value("Solid Color", TaggedValue::OptionalColor(None), false),
 				DocumentInputType::value("Gradient Type", TaggedValue::GradientType(vector::style::GradientType::Linear), false),
 				DocumentInputType::value("Start", TaggedValue::DVec2(DVec2::new(0., 0.5)), false),

editor/src/messages/portfolio/document/node_graph/node_graph_message_handler/node_properties.rs

@@ -594,7 +594,7 @@ fn fill_type_widget(document_node: &DocumentNode, node_id: NodeId, index: usize)
 			Separator::new(SeparatorType::Unrelated).widget_holder(),
 			RadioInput::new(entries)
 				.selected_index(match fill_type {
-					FillType::None | FillType::Solid => Some(0),
+					FillType::Solid => Some(0),
 					FillType::Gradient => Some(1),
 				})
 				.widget_holder(),

node-graph/gcore/src/vector/style.rs

@@ -209,7 +209,6 @@ impl Fill {
 #[repr(C)]
 #[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize, DynAny, Hash, specta::Type)]
 pub enum FillType {
-	None,
 	Solid,
 	Gradient,
 }

node-graph/gcore/src/vector/vector_nodes.rs

@@ -31,7 +31,7 @@ fn set_vector_data_fill(
 	positions: Vec<(f64, Option<Color>)>,
 ) -> VectorData {
 	vector_data.style.set_fill(match fill_type {
-		FillType::None | FillType::Solid => solid_color.map_or(Fill::None, Fill::Solid),
+		FillType::Solid => solid_color.map_or(Fill::None, Fill::Solid),
 		FillType::Gradient => Fill::Gradient(Gradient {
 			start,
 			end,