Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-12-02 00:52:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #84310 from timothyqiu/dnd

Browse Source 
Allow dragging editable children
This commit is contained in:
Rémi Verschelde 2023-12-04 23:02:45 +01:00
commit 98882f1c69
No known key found for this signature in database
GPG Key ID: C3336907360768E1
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
editor/gui/scene_tree_editor.cpp
View File

@ -50,7 +50,7 @@
#include "scene/main/window.h" #include "scene/main/window.h"
#include "scene/resources/packed_scene.h" #include "scene/resources/packed_scene.h"
Node *SceneTreeEditor::get_scene_node() { Node *SceneTreeEditor::get_scene_node() const {
ERR_FAIL_COND_V(!is_inside_tree(), nullptr); ERR_FAIL_COND_V(!is_inside_tree(), nullptr);
return get_tree()->get_edited_scene_root(); return get_tree()->get_edited_scene_root();
@ -1218,11 +1218,8 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
Node *n = get_node(np); Node *n = get_node(np);
if (n) { if (n) {
// Only allow selection if not part of an instantiated scene. selected_nodes.push_back(n);
if (!n->get_owner() || n->get_owner() == get_scene_node() || n->get_owner()->get_scene_file_path().is_empty()) { icons.push_back(next->get_icon(0));
selected_nodes.push_back(n);
icons.push_back(next->get_icon(0));
}
} }
next = tree->get_next_selected(next); next = tree->get_next_selected(next);
} }
@ -1336,7 +1333,21 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
} }
} }
return String(d["type"]) == "nodes" && filter.is_empty(); if (filter.is_empty() && String(d["type"]) == "nodes") {
Array nodes = d["nodes"];
for (int i = 0; i < nodes.size(); i++) {
Node *n = get_node(nodes[i]);
// Nodes from an instantiated scene can't be rearranged.
if (n && n->get_owner() && n->get_owner() != get_scene_node() && !n->get_owner()->get_scene_file_path().is_empty()) {
return false;
}
}
return true;
}
return false;
} }
void SceneTreeEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) { void SceneTreeEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {

2
editor/gui/scene_tree_editor.h
View File

@ -120,7 +120,7 @@ class SceneTreeEditor : public Control {
void _set_item_custom_color(TreeItem *p_item, Color p_color); void _set_item_custom_color(TreeItem *p_item, Color p_color);
void _selection_changed(); void _selection_changed();
Node *get_scene_node(); Node *get_scene_node() const;
Variant get_drag_data_fw(const Point2 &p_point, Control *p_from); Variant get_drag_data_fw(const Point2 &p_point, Control *p_from);
bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const; bool can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const;