mirrors/Graphite
1
0
Fork 0
mirror of https://github.com/GraphiteEditor/Graphite.git synced 2025-08-04 05:18:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix showing only compatible nodes

Browse source
This commit is contained in:
Adesh Gupta 2025-07-07 19:44:48 +05:30
parent 24c6281644
commit 0cb69436c8
3 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
editor/src/messages/layout/utility_types/widgets/input_widgets.rs
View file

@ -332,6 +332,9 @@ pub enum NumberInputMode {
pub struct NodeCatalog { pub struct NodeCatalog {
pub disabled: bool, pub disabled: bool,
#[serde(rename = "initialSearchTerm")]
pub intial_search: String,
// Callbacks // Callbacks
#[serde(skip)] #[serde(skip)]
#[derivative(Debug = "ignore", PartialEq = "ignore")] #[derivative(Debug = "ignore", PartialEq = "ignore")]

18
editor/src/messages/portfolio/document/document_message_handler.rs
View file

@ -16,7 +16,7 @@ use crate::messages::portfolio::document::overlays::utility_types::{OverlaysType
use crate::messages::portfolio::document::properties_panel::utility_types::PropertiesPanelMessageHandlerData; use crate::messages::portfolio::document::properties_panel::utility_types::PropertiesPanelMessageHandlerData;
use crate::messages::portfolio::document::utility_types::document_metadata::{DocumentMetadata, LayerNodeIdentifier}; use crate::messages::portfolio::document::utility_types::document_metadata::{DocumentMetadata, LayerNodeIdentifier};
use crate::messages::portfolio::document::utility_types::misc::{AlignAggregate, AlignAxis, DocumentMode, FlipAxis, PTZ}; use crate::messages::portfolio::document::utility_types::misc::{AlignAggregate, AlignAxis, DocumentMode, FlipAxis, PTZ};
use crate::messages::portfolio::document::utility_types::network_interface::{FlowType, InputConnector, NodeTemplate}; use crate::messages::portfolio::document::utility_types::network_interface::{FlowType, InputConnector, NodeTemplate, OutputConnector};
use crate::messages::portfolio::document::utility_types::nodes::RawBuffer; use crate::messages::portfolio::document::utility_types::nodes::RawBuffer;
use crate::messages::portfolio::utility_types::PersistentData; use crate::messages::portfolio::utility_types::PersistentData;
use crate::messages::prelude::*; use crate::messages::prelude::*;
@ -2704,7 +2704,21 @@ impl DocumentMessageHandler {
.tooltip("Add an operation to the end of this layer's chain of nodes") .tooltip("Add an operation to the end of this layer's chain of nodes")
.disabled(!has_selection || has_multiple_selection) .disabled(!has_selection || has_multiple_selection)
.popover_layout({ .popover_layout({
let node_chooser = NodeCatalog::new() // Showing only compatible types
let compatible_type = selected_layer.and_then(|layer| {
let input_connector = InputConnector::node(layer.to_node(), 1);
if let Some(OutputConnector::Node { node_id, .. }) = self.network_interface.upstream_output_connector(&input_connector, &self.selection_network_path) {
let (output_type, _) = self.network_interface.output_type(&node_id, 0, &self.selection_network_path);
Some(format!("type:{}", output_type.nested_type()))
} else {
None
}
});
let mut node_chooser = NodeCatalog::new();
node_chooser.intial_search = compatible_type.unwrap_or("".to_string());
let node_chooser = node_chooser
.on_update(move |node_type| { .on_update(move |node_type| {
if let Some(layer) = selected_layer { if let Some(layer) = selected_layer {
NodeGraphMessage::CreateNodeInLayerWithTransaction { NodeGraphMessage::CreateNodeInLayerWithTransaction {

14
editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs
View file

@ -2112,7 +2112,19 @@ impl NodeGraphMessageHandler {
.icon(Some("Node".to_string())) .icon(Some("Node".to_string()))
.tooltip("Add an operation to the end of this layer's chain of nodes") .tooltip("Add an operation to the end of this layer's chain of nodes")
.popover_layout({ .popover_layout({
let node_chooser = NodeCatalog::new() let input_connector = InputConnector::node(layer, 1);
let compatible_type =
if let Some(OutputConnector::Node { node_id, .. }) = context.network_interface.upstream_output_connector(&input_connector, &context.selection_network_path) {
let (output_type, _) = context.network_interface.output_type(&node_id, 0, &context.selection_network_path);
Some(format!("type:{}", output_type.nested_type()))
} else {
None
};
let mut node_chooser = NodeCatalog::new();
node_chooser.intial_search = compatible_type.unwrap_or("".to_string());
let node_chooser = node_chooser
.on_update(move |node_type| { .on_update(move |node_type| {
NodeGraphMessage::CreateNodeInLayerWithTransaction { NodeGraphMessage::CreateNodeInLayerWithTransaction {
node_type: node_type.clone(), node_type: node_type.clone(),