godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes position offset of node groups set by arrange_nodes() in GraphEdit

Browse Source
This commit is contained in:
Umang Kalra 2021-08-22 03:57:48 +05:30
parent e60a1559c9
commit aee3de7b79
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
scene/gui/graph_edit.cpp
View File

@ -2048,7 +2048,6 @@ void GraphEdit::arrange_nodes() {
if (gn->is_selected()) { if (gn->is_selected()) {
selected_nodes.insert(gn->get_name()); selected_nodes.insert(gn->get_name());
origin = origin < gn->get_position_offset() ? origin : gn->get_position_offset();
Set<StringName> s; Set<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]);
@ -2072,6 +2071,11 @@ void GraphEdit::arrange_nodes() {
} }
} }
if (!selected_nodes.size()) {
arranging_graph = false;
return;
}
HashMap<int, Vector<StringName>> layers = _layering(selected_nodes, upper_neighbours); HashMap<int, Vector<StringName>> layers = _layering(selected_nodes, upper_neighbours);
_crossing_minimisation(layers, upper_neighbours); _crossing_minimisation(layers, upper_neighbours);
@ -2098,16 +2102,16 @@ void GraphEdit::arrange_nodes() {
for (const Set<StringName>::Element *E = block_heads.front(); E; E = E->next()) { for (const Set<StringName>::Element *E = block_heads.front(); E; E = E->next()) {
_place_block(E->get(), gap_v, layers, root, align, node_names, inner_shift, sink, shift, new_positions); _place_block(E->get(), gap_v, layers, root, align, node_names, inner_shift, sink, shift, new_positions);
} }
origin.y = Object::cast_to<GraphNode>(node_names[layers[0][0]])->get_position_offset().y - (new_positions[layers[0][0]].y + (float)inner_shift[layers[0][0]]);
origin.x = Object::cast_to<GraphNode>(node_names[layers[0][0]])->get_position_offset().x;
for (const Set<StringName>::Element *E = block_heads.front(); E; E = E->next()) { for (const Set<StringName>::Element *E = block_heads.front(); E; E = E->next()) {
StringName u = E->get(); StringName u = E->get();
StringName prev = u;
float start_from = origin.y + new_positions[E->get()].y; float start_from = origin.y + new_positions[E->get()].y;
do { do {
Vector2 cal_pos; Vector2 cal_pos;
cal_pos.y = start_from + (real_t)inner_shift[u]; cal_pos.y = start_from + (real_t)inner_shift[u];
new_positions.set(u, cal_pos); new_positions.set(u, cal_pos);
prev = u;
u = align[u]; u = align[u];
} while (u != E->get()); } while (u != E->get());
} }
@ -2130,10 +2134,11 @@ void GraphEdit::arrange_nodes() {
if (current_node_size == largest_node_size) { if (current_node_size == largest_node_size) {
cal_pos.x = start_from; cal_pos.x = start_from;
} else { } else {
float current_node_start_pos; float current_node_start_pos = start_from;
if (current_node_size >= largest_node_size / 2) { if (current_node_size < largest_node_size / 2) {
current_node_start_pos = start_from; if (!(i || j)) {
} else { start_from -= (largest_node_size - current_node_size);
}
current_node_start_pos = start_from + largest_node_size - current_node_size; current_node_start_pos = start_from + largest_node_size - current_node_size;
} }
cal_pos.x = current_node_start_pos; cal_pos.x = current_node_start_pos;