godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-06 12:20:30 +00:00
Code Releases Wiki Activity

Allow dragging editable children

Browse Source
This commit is contained in:
Haoyu Qiu
2023-12-06 16:26:37 +08:00
parent e96c42f0e1
commit f32db73cd2
2 changed files with 19 additions and 8 deletions
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/main/viewport.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();
@@ -995,11 +995,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 instanced scene. selected.push_back(n);
if (!n->get_owner() || n->get_owner() == get_scene_node() || n->get_owner()->get_filename() == String()) { icons.push_back(next->get_icon(0));
selected.push_back(n);
icons.push_back(next->get_icon(0));
}
} }
next = tree->get_next_selected(next); 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) { 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)) { 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 _update_visibility_color(Node *p_node, TreeItem *p_item);
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;