asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #70933 from fire/empty-organize-graph-node

Browse source 
Update GraphEdit to automatically arrange nodes if nothing is selected
This commit is contained in:
Rémi Verschelde 2023-01-05 12:58:20 +01:00
commit 778684ffaa
No known key found for this signature in database
GPG key ID: C3336907360768E1
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
scene/gui/graph_edit.cpp
View file

@ -2134,6 +2134,7 @@ void GraphEdit::arrange_nodes() {
Dictionary node_names; Dictionary node_names;
HashSet<StringName> selected_nodes; HashSet<StringName> selected_nodes;
bool arrange_entire_graph = true;
for (int i = get_child_count() - 1; i >= 0; i--) { for (int i = get_child_count() - 1; i >= 0; i--) {
GraphNode *gn = Object::cast_to<GraphNode>(get_child(i)); GraphNode *gn = Object::cast_to<GraphNode>(get_child(i));
if (!gn) { if (!gn) {
@ -2141,6 +2142,10 @@ void GraphEdit::arrange_nodes() {
} }
node_names[gn->get_name()] = gn; node_names[gn->get_name()] = gn;
if (gn->is_selected()) {
arrange_entire_graph = false;
}
} }
HashMap<StringName, HashSet<StringName>> upper_neighbours; HashMap<StringName, HashSet<StringName>> upper_neighbours;
@ -2156,12 +2161,12 @@ void GraphEdit::arrange_nodes() {
continue; continue;
} }
if (gn->is_selected()) { if (gn->is_selected() || arrange_entire_graph) {
selected_nodes.insert(gn->get_name()); selected_nodes.insert(gn->get_name());
HashSet<StringName> s; HashSet<StringName> s;
for (List<Connection>::Element *E = connections.front(); E; E = E->next()) { for (List<Connection>::Element *E = connections.front(); E; E = E->next()) {
GraphNode *p_from = Object::cast_to<GraphNode>(node_names[E->get().from]); GraphNode *p_from = Object::cast_to<GraphNode>(node_names[E->get().from]);
if (E->get().to == gn->get_name() && p_from->is_selected() && E->get().to != E->get().from) { if (E->get().to == gn->get_name() && (p_from->is_selected() || arrange_entire_graph) && E->get().to != E->get().from) {
if (!s.has(p_from->get_name())) { if (!s.has(p_from->get_name())) {
s.insert(p_from->get_name()); s.insert(p_from->get_name());
} }