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

Merge pull request #85827 from timothyqiu/dnd-3

Browse source 
[3.x] Allow dragging editable children
This commit is contained in:
Rémi Verschelde 2023-12-08 15:43:17 +01:00
commit 6b28d93bbc
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/scene_tree_editor.cpp
View file

@ -40,7 +40,7 @@
#include "scene/main/viewport.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);
return get_tree()->get_edited_scene_root();
@ -995,11 +995,8 @@ Variant SceneTreeEditor::get_drag_data_fw(const Point2 &p_point, Control *p_from
Node *n = get_node(np);
if (n) {
// Only allow selection if not part of an instanced scene.
if (!n->get_owner() || n->get_owner() == get_scene_node() || n->get_owner()->get_filename() == String()) {
selected.push_back(n);
icons.push_back(next->get_icon(0));
}
selected.push_back(n);
icons.push_back(next->get_icon(0));
}
next = tree->get_next_selected(next);
}
@ -1110,7 +1107,21 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
}
}
return String(d["type"]) == "nodes" && filter == String();
if (filter.empty() && String(d["type"]) == "nodes") {
Array nodes = d["nodes"];
for (int i = 0; i < nodes.size(); i++) {
Node *n = get_node(nodes[i]);
// Only allow selection if not part of an instanced scene.
if (n && n->get_owner() && n->get_owner() != get_scene_node() && !n->get_owner()->get_filename().empty()) {
return false;
}
}
return true;
}
return false;
}
void SceneTreeEditor::drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) {
if (!can_drop_data_fw(p_point, p_data, p_from)) {

2
editor/scene_tree_editor.h
View file

@ -114,7 +114,7 @@ class SceneTreeEditor : public Control {
void _update_visibility_color(Node *p_node, TreeItem *p_item);
void _selection_changed();
Node *get_scene_node();
Node *get_scene_node() const;
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;