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

Fix deleting all artboards without crashing (#1502) 

* Fix delete all artboards

* Remove unused import causing warning

---------

Co-authored-by: Keavon Chambers <keavon@keavon.com>
This commit is contained in:
0HyperCube 2023-12-11 21:46:08 +00:00 committed by GitHub
parent bfee09fe75
commit 421e7c025f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/src/messages/portfolio/document/node_graph/graph_operation_message_handler.rs
View File

@ -713,9 +713,11 @@ impl MessageHandler<GraphOperationMessage, (&mut Document, &mut NodeGraphMessage
} }
GraphOperationMessage::ClearArtboards => { GraphOperationMessage::ClearArtboards => {
let mut modify_inputs = ModifyInputsContext::new(document, node_graph, responses); let mut modify_inputs = ModifyInputsContext::new(document, node_graph, responses);
let artboard_nodes = modify_inputs.network.nodes.iter().filter(|(_, node)| node.name == "Artboard").map(|(id, _)| *id).collect::<Vec<_>>(); let layer_nodes = modify_inputs.network.nodes.iter().filter(|(_, node)| node.is_layer()).map(|(id, _)| *id).collect::<Vec<_>>();
for id in artboard_nodes { for layer in layer_nodes {
modify_inputs.delete_layer(id); if modify_inputs.network.upstream_flow_back_from_nodes(vec![layer], true).any(|(node, _id)| node.name == "Artboard") {
modify_inputs.delete_layer(layer);
}
} }
document.load_network_structure(); document.load_network_structure();
} }

2
editor/src/messages/portfolio/menu_bar/menu_bar_message_handler.rs
View File

@ -254,7 +254,7 @@ impl LayoutHolder for MenuBarMessageHandler {
no_active_document, no_active_document,
MenuBarEntryChildren(vec![vec![MenuBarEntry { MenuBarEntryChildren(vec![vec![MenuBarEntry {
label: "Clear Artboards".into(), label: "Clear Artboards".into(),
action: MenuBarEntry::create_action(|_| DialogMessage::RequestComingSoonDialog { issue: None }.into()), action: MenuBarEntry::create_action(|_| GraphOperationMessage::ClearArtboards.into()),
disabled: no_active_document, disabled: no_active_document,
..MenuBarEntry::default() ..MenuBarEntry::default()
}]]), }]]),