godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-04 17:04:49 +00:00
Code Releases Wiki Activity

Allow moving nodes when they have different parents in SceneTreeDock

Browse Source
This commit is contained in:
Nikita Samusev
2025-06-30 22:11:51 +03:00
parent 53be3b78d1
commit cde07bfb9e
1 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
editor/docks/scene_tree_dock.cpp
View File

@@ -818,34 +818,24 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
bool MOVING_DOWN = (p_tool == TOOL_MOVE_DOWN); bool MOVING_DOWN = (p_tool == TOOL_MOVE_DOWN);
bool MOVING_UP = !MOVING_DOWN; bool MOVING_UP = !MOVING_DOWN;
Node *common_parent = scene_tree->get_selected()->get_parent(); List<Node *> selection = editor_selection->get_full_selected_node_list();
List<Node *> selection = editor_selection->get_top_selected_node_list();
selection.sort_custom<Node::Comparator>(); // sort by index selection.sort_custom<Node::Comparator>(); // sort by index
if (MOVING_DOWN) { if (MOVING_DOWN) {
selection.reverse(); selection.reverse();
} }
int lowest_id = common_parent->get_child_count(false) - 1; bool is_nowhere_to_move = false;
int highest_id = 0;
for (Node *E : selection) { for (Node *E : selection) {
// `move_child` + `get_index` doesn't really work for internal nodes. // `move_child` + `get_index` doesn't really work for internal nodes.
ERR_FAIL_COND_MSG(E->is_internal(), "Trying to move internal node, this is not supported."); ERR_FAIL_COND_MSG(E->is_internal(), "Trying to move internal node, this is not supported.");
int index = E->get_index(false);
if (index > highest_id) { if ((MOVING_DOWN && (E->get_index() == E->get_parent()->get_child_count(false) - 1)) || (MOVING_UP && (E->get_index() == 0))) {
highest_id = index; is_nowhere_to_move = true;
} break;
if (index < lowest_id) {
lowest_id = index;
}
if (E->get_parent() != common_parent) {
common_parent = nullptr;
} }
} }
if (is_nowhere_to_move) {
if (!common_parent || (MOVING_DOWN && highest_id >= common_parent->get_child_count(false) - MOVING_DOWN) || (MOVING_UP && lowest_id == 0)) { break;
break; // one or more nodes can not be moved
} }
EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton(); EditorUndoRedoManager *undo_redo = EditorUndoRedoManager::get_singleton();