jess
/
Graphite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add feature for switching existing boolean ops to another type in the Select tool (#2322) 

* Add feature for toggling an existing boolean to another type in Select tool

* Code simplifications and comments

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
Oliver Davies 2025-02-27 21:39:21 -08:00 committed by GitHub
parent cbb535b6b5
commit effadcf6a6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 49 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
editor/src/messages/portfolio/document/document_message_handler.rs
View File

@ -16,6 +16,7 @@ use crate::messages::portfolio::document::overlays::grid_overlays::{grid_overlay
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::misc::{AlignAggregate, AlignAxis, DocumentMode, FlipAxis, PTZ};
use crate::messages::portfolio::document::utility_types::network_interface::{FlowType, InputConnector};
use crate::messages::portfolio::document::utility_types::nodes::RawBuffer;
use crate::messages::portfolio::utility_types::PersistentData;
use crate::messages::prelude::*;
@ -27,7 +28,7 @@ use crate::node_graph_executor::NodeGraphExecutor;
use bezier_rs::Subpath;
use graph_craft::document::value::TaggedValue;
use graph_craft::document::{NodeId, NodeNetwork, OldNodeNetwork};
use graph_craft::document::{NodeId, NodeInput, NodeNetwork, OldNodeNetwork};
use graphene_core::raster::image::ImageFrame;
use graphene_core::raster::BlendMode;
use graphene_core::vector::style::ViewMode;
@ -487,7 +488,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
};
let insert_index = DocumentMessageHandler::get_calculated_insert_index(self.metadata(), selected_nodes, parent);
DocumentMessageHandler::group_layers(responses, insert_index, parent, group_folder_type);
DocumentMessageHandler::group_layers(responses, insert_index, parent, group_folder_type, &mut self.network_interface);
}
// Artboard workflow
else {
@ -509,7 +510,7 @@ impl MessageHandler<DocumentMessage, DocumentMessageData<'_>> for DocumentMessag
responses.add(NodeGraphMessage::SelectedNodesSet { nodes: child_selected_nodes.0 });
new_folders.push(DocumentMessageHandler::group_layers(responses, insert_index, parent, group_folder_type));
new_folders.push(DocumentMessageHandler::group_layers(responses, insert_index, parent, group_folder_type, &mut self.network_interface));
}
responses.add(NodeGraphMessage::SelectedNodesSet { nodes: new_folders });
@ -1774,8 +1775,15 @@ impl DocumentMessageHandler {
.unwrap_or(0)
}
pub fn group_layers(responses: &mut VecDeque<Message>, insert_index: usize, parent: LayerNodeIdentifier, group_folder_type: GroupFolderType) -> NodeId {
pub fn group_layers(
responses: &mut VecDeque<Message>,
insert_index: usize,
parent: LayerNodeIdentifier,
group_folder_type: GroupFolderType,
network_interface: &mut NodeNetworkInterface,
) -> NodeId {
let folder_id = NodeId(generate_uuid());
match group_folder_type {
GroupFolderType::Layer => responses.add(GraphOperationMessage::NewCustomLayer {
id: folder_id,
@ -1784,14 +1792,45 @@ impl DocumentMessageHandler {
insert_index,
}),
GroupFolderType::BooleanOperation(operation) => {
responses.add(GraphOperationMessage::NewBooleanOperationLayer {
id: folder_id,
operation,
parent,
insert_index,
// Get the ID of the one selected layer, if exactly one is selected
let only_selected_layer = network_interface.selected_nodes(&[]).and_then(|selected_nodes| {
let mut layers = selected_nodes.selected_layers(network_interface.document_metadata());
match (layers.next(), layers.next()) {
(Some(id), None) => Some(id),
_ => None,
}
});
// If there is a single selected layer, check if there is a boolean operation upstream from it
let upstream_boolean_op = only_selected_layer.and_then(|selected_id| {
network_interface.upstream_flow_back_from_nodes(vec![selected_id.to_node()], &[], FlowType::HorizontalFlow).find(|id| {
network_interface
.reference(id, &[])
.map(|name| name.as_deref().unwrap_or_default() == "Boolean Operation")
.unwrap_or_default()
})
});
// If there's already a boolean operation on the selected layer, update it with the new operation
if let (Some(upstream_boolean_op), Some(only_selected_layer)) = (upstream_boolean_op, only_selected_layer) {
network_interface.set_input(&InputConnector::node(upstream_boolean_op, 1), NodeInput::value(TaggedValue::BooleanOperation(operation), false), &[]);
responses.add(NodeGraphMessage::RunDocumentGraph);
return only_selected_layer.to_node();
}
// Otherwise, create a new boolean operation node group
else {
responses.add(GraphOperationMessage::NewBooleanOperationLayer {
id: folder_id,
operation,
parent,
insert_index,
});
}
}
};
}
let new_group_folder = LayerNodeIdentifier::new_unchecked(folder_id);
// Move the new folder to the correct position
responses.add(NodeGraphMessage::MoveLayerToStack {