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

Move the "Text" category nodes from gcore/src/logic.rs to text/src/lib.rs (#4042)

Browse Source 
Move the String category nodes from gcore/src/logic.rs to text/src/lib.rs
This commit is contained in:
Keavon Chambers
2026-04-23 18:12:28 -07:00
committed by GitHub
parent 1444c333ab
commit a59fed9d1c
13 changed files with 240 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/src/messages/portfolio/document/node_graph/document_node_definitions.rs
View File

@@ -537,7 +537,7 @@ fn document_node_definitions() -> HashMap<DefinitionIdentifier, DocumentNodeDefi
},
// 11: Switch (closed → count, open → max(count - 1, 1) as denominator)
DocumentNode {
implementation: DocumentNodeImplementation::ProtoNode(logic::switch::IDENTIFIER),
implementation: DocumentNodeImplementation::ProtoNode(math_nodes::switch::IDENTIFIER),
inputs: vec![NodeInput::node(NodeId(10), 0), NodeInput::node(NodeId(17), 0), NodeInput::node(NodeId(18), 0)],
..Default::default()
},

1
editor/src/messages/portfolio/document/node_graph/node_properties.rs
View File

@@ -196,7 +196,6 @@ pub(crate) fn property_from_type(
Some("Fraction") => number_widget(default_info, number_input.mode_range().min(min(0.)).max(max(1.))).into(),
Some("Progression") => progression_widget(default_info, number_input.min(min(0.))).into(),
Some("SignedInteger") => number_widget(default_info, number_input.int()).into(),
Some("IntegerCount") => number_widget(default_info, number_input.int().min(min(1.))).into(),
Some("SeedValue") => number_widget(default_info, number_input.int().min(min(0.))).into(),
Some("PixelSize") => vec2_widget(default_info, "X", "Y", unit.unwrap_or(" px"), None, false),
Some("TextArea") => text_area_widget(default_info).into(),

76
editor/src/messages/portfolio/document_migration.rs
View File

@@ -108,10 +108,6 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
node: graphene_std::animation::real_time::IDENTIFIER,
aliases: &["graphene_core::animation::RealTimeNode"],
},
NodeReplacement {
node: graphene_std::logic::serialize::IDENTIFIER,
aliases: &["graphene_core::logic::SerializeNode"],
},
NodeReplacement {
node: graphene_std::debug::size_of::IDENTIFIER,
aliases: &["graphene_core::ops::SizeOfNode"],
@@ -120,34 +116,6 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
node: graphene_std::debug::some::IDENTIFIER,
aliases: &["graphene_core::ops::SomeNode"],
},
NodeReplacement {
node: graphene_std::logic::string_concatenate::IDENTIFIER,
aliases: &["graphene_core::logic::StringConcatenateNode"],
},
NodeReplacement {
node: graphene_std::logic::string_length::IDENTIFIER,
aliases: &["graphene_core::logic::StringLengthNode"],
},
NodeReplacement {
node: graphene_std::logic::string_replace::IDENTIFIER,
aliases: &["graphene_core::logic::StringReplaceNode"],
},
NodeReplacement {
node: graphene_std::logic::string_slice::IDENTIFIER,
aliases: &["graphene_core::logic::StringSliceNode"],
},
NodeReplacement {
node: graphene_std::logic::string_split::IDENTIFIER,
aliases: &["graphene_core::logic::StringSplitNode"],
},
NodeReplacement {
node: graphene_std::logic::switch::IDENTIFIER,
aliases: &["graphene_core::logic::SwitchNode"],
},
NodeReplacement {
node: graphene_std::logic::to_string::IDENTIFIER,
aliases: &["graphene_core::logic::ToStringNode"],
},
NodeReplacement {
node: graphene_std::debug::unwrap_option::IDENTIFIER,
aliases: &["graphene_core::ops::UnwrapNode", "graphene_core::debug::UnwrapNode"],
@@ -416,10 +384,6 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
node: graphene_std::math_nodes::sine_inverse::IDENTIFIER,
aliases: &["graphene_math_nodes::SineInverseNode", "graphene_core::ops::SineInverseNode"],
},
NodeReplacement {
node: graphene_std::math_nodes::string_value::IDENTIFIER,
aliases: &["graphene_math_nodes::StringValueNode", "graphene_core::ops::StringValueNode"],
},
NodeReplacement {
node: graphene_std::math_nodes::subtract::IDENTIFIER,
aliases: &["graphene_math_nodes::SubtractNode", "graphene_core::ops::SubtractNode"],
@@ -680,6 +644,46 @@ const NODE_REPLACEMENTS: &[NodeReplacement<'static>] = &[
node: graphene_std::text::text::IDENTIFIER,
aliases: &["graphene_core::text::text::TextNode", "graphene_core::text::TextGeneratorNode", "graphene_core::text::TextNode"],
},
NodeReplacement {
node: graphene_std::text_nodes::string_value::IDENTIFIER,
aliases: &["graphene_math_nodes::StringValueNode", "graphene_core::ops::StringValueNode", "math_nodes::StringValueNode"],
},
NodeReplacement {
node: graphene_std::text_nodes::string_concatenate::IDENTIFIER,
aliases: &["graphene_core::logic::StringConcatenateNode"],
},
NodeReplacement {
node: graphene_std::text_nodes::string_length::IDENTIFIER,
aliases: &["graphene_core::logic::StringLengthNode"],
},
NodeReplacement {
node: graphene_std::text_nodes::string_replace::IDENTIFIER,
aliases: &["graphene_core::logic::StringReplaceNode"],
},
NodeReplacement {
node: graphene_std::text_nodes::string_slice::IDENTIFIER,
aliases: &["graphene_core::logic::StringSliceNode"],
},
NodeReplacement {
node: graphene_std::text_nodes::string_split::IDENTIFIER,
aliases: &["graphene_core::logic::StringSplitNode"],
},
NodeReplacement {
node: graphene_std::math_nodes::switch::IDENTIFIER,
aliases: &["graphene_core::logic::SwitchNode"],
},
NodeReplacement {
node: graphene_std::text_nodes::to_string::IDENTIFIER,
aliases: &["graphene_core::logic::ToStringNode"],
},
NodeReplacement {
node: graphene_std::text_nodes::json_get::IDENTIFIER,
aliases: &["graphene_core::logic::JsonGetNode"],
},
NodeReplacement {
node: graphene_std::text_nodes::serialize::IDENTIFIER,
aliases: &["graphene_core::logic::SerializeNode"],
},
// ================================
// transform
// ================================