fork/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2026-09-26 04:18:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* Remove FillType::None for the fill node

* Fix demo art
This commit is contained in:
0HyperCube
2024-01-13 15:52:10 -08:00
committed by GitHub
parent e0adf1040f
commit 47b3355950
7 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/src/messages/portfolio/document/node_graph/graph_operation_message_handler.rs
+1 -2
View File
@@ -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::Solid(_) => FillType::Solid,
Fill::None | 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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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(),