Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Selection history navigation with Alt+[ and Alt+] keys should filter out empty selections #2136

Closed
wants to merge 12 commits into from
Closed

Selection history navigation with Alt+[ and Alt+] keys should filter out empty selections #2136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1e17d32
filtering empty selections
0SlowPoke0 Nov 17, 2024
aedace4
used retain instead of putting in heap
0SlowPoke0 Nov 20, 2024
f98ae55
fixed the selection-step-back
0SlowPoke0 Nov 23, 2024
5286bc4
filtering_in_fsm
0SlowPoke0 Dec 12, 2024
f8fd8f5
removed the previous added retain and log(for debugging)
0SlowPoke0 Dec 12, 2024
5427956
removed the fsm code
0SlowPoke0 Dec 14, 2024
73e859f
undo the code in selected_nodes_mut
0SlowPoke0 Dec 19, 2024
ade89be
Major simplification, surely this is equivalent?
Keavon Dec 17, 2024
e5fb193
filtering empty selections
0SlowPoke0 Nov 17, 2024
e4f3f5f
used retain instead of putting in heap
0SlowPoke0 Nov 20, 2024
b8d065c
fixed the selection-step-back
0SlowPoke0 Nov 23, 2024
9dafb91
removed the previous added retain and log(for debugging)
0SlowPoke0 Dec 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions editor/src/messages/portfolio/document/node_graph/node_graph_message_handler.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,13 +1209,15 @@ impl<'a> MessageHandler<NodeGraphMessage, NodeGraphHandlerData<'a>> for NodeGrap
responses.add(BroadcastEvent::SelectionChanged);
}
NodeGraphMessage::SelectedNodesSet { nodes } => {
let Some(selected_nodes) = network_interface.selected_nodes_mut(selection_network_path) else {
log::error!("Could not get selected nodes in NodeGraphMessage::SelectedNodesSet");
return;
};
selected_nodes.set_selected_nodes(nodes);
responses.add(BroadcastEvent::SelectionChanged);
responses.add(PropertiesPanelMessage::Refresh);
if !nodes.is_empty() {
let Some(selected_nodes) = network_interface.selected_nodes_mut(selection_network_path) else {
log::error!("Could not get selected nodes in NodeGraphMessage::SelectedNodesSet");
return;
};
selected_nodes.set_selected_nodes(nodes);
responses.add(BroadcastEvent::SelectionChanged);
responses.add(PropertiesPanelMessage::Refresh);
}
}
NodeGraphMessage::SendClickTargets => responses.add(FrontendMessage::UpdateClickTargets {
click_targets: Some(network_interface.collect_frontend_click_targets(breadcrumb_network_path)),
Expand Down
1 change: 1 addition & 0 deletions editor/src/messages/portfolio/document/utility_types/network_interface.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,6 +1585,7 @@ impl NodeNetworkInterface {
/// Mutably get the selected nodes for the network at the network_path. Every time they are mutated, the transient metadata for the top of the stack gets unloaded.
pub fn selected_nodes_mut(&mut self, network_path: &[NodeId]) -> Option<&mut SelectedNodes> {
self.unload_stack_dependents(network_path);

let Some(network_metadata) = self.network_metadata_mut(network_path) else {
log::error!("Could not get nested network_metadata in selected_nodes");
return None;
Expand Down
1 change: 1 addition & 0 deletions editor/src/messages/tool/tool_messages/select_tool.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,7 @@ impl Fsm for SelectToolFsmState {
let quad = tool_data.selection_quad();
let new_selected: HashSet<_> = document.intersect_quad_no_artboards(quad, input).collect();
let current_selected: HashSet<_> = document.network_interface.selected_nodes(&[]).unwrap().selected_layers(document.metadata()).collect();

if new_selected != current_selected {
tool_data.layers_dragging = new_selected.into_iter().collect();
responses.add(NodeGraphMessage::SelectedNodesSet {
Expand Down
Loading