noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #120102 from bruvzg/sct_drop

Browse Source 
[Editor] Fix `SceneTreeEditor` drop.
This commit is contained in:
Thaddeus Crews
2026-06-09 11:03:50 -05:00
parent 9d876745b3 363610d752
commit ec67cbe926
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
editor/scene/scene_tree_editor.cpp
+11 -12
View File
@@ -1914,6 +1914,11 @@ bool SceneTreeEditor::_is_script_type(const StringName &p_type) const {
return (script_types->has(p_type));
}
bool SceneTreeEditor::_has_drop_selection(TreeItem *p_item, const Point2 &p_point) const {
int section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(p_item).position) : tree->get_drop_section_at_position(p_point);
return !(section < -1 || (section == -1 && !p_item->get_parent()));
}
bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_data, Control *p_from) const {
if (!can_rename) {
return false; // Not editable tree.
@@ -1934,11 +1939,6 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
return false;
}
int section = (p_point == Vector2(Math::INF, Math::INF)) ? tree->get_drop_section_at_position(tree->get_item_rect(item).position) : tree->get_drop_section_at_position(p_point);
if (section < -1 || (section == -1 && !item->get_parent())) {
return false;
}
if (String(d["type"]) == "files") {
Vector<String> files = d["files"];
@@ -1948,7 +1948,7 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
if (_is_script_type(EditorFileSystem::get_singleton()->get_file_type(files[0]))) {
tree->set_drop_mode_flags(Tree::DROP_MODE_ON_ITEM);
return true;
return _has_drop_selection(item, p_point);
}
bool scene_drop = true;
@@ -1965,7 +1965,7 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
if (scene_drop) {
tree->set_drop_mode_flags(Tree::DROP_MODE_INBETWEEN | Tree::DROP_MODE_ON_ITEM);
return true;
return _has_drop_selection(item, p_point);
}
if (audio_drop) {
@@ -1974,15 +1974,14 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
} else {
tree->set_drop_mode_flags(Tree::DROP_MODE_INBETWEEN | Tree::DROP_MODE_ON_ITEM);
}
return true;
return _has_drop_selection(item, p_point);
}
if (files.size() > 1) {
return false;
}
tree->set_drop_mode_flags(Tree::DROP_MODE_ON_ITEM);
return true;
return _has_drop_selection(item, p_point);
}
if (String(d["type"]) == "script_list_element") {
@@ -1991,7 +1990,7 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
String sp = se->get_edited_resource()->get_path();
if (_is_script_type(EditorFileSystem::get_singleton()->get_file_type(sp))) {
tree->set_drop_mode_flags(Tree::DROP_MODE_ON_ITEM);
return true;
return _has_drop_selection(item, p_point);
}
}
}
@@ -2007,7 +2006,7 @@ bool SceneTreeEditor::can_drop_data_fw(const Point2 &p_point, const Variant &p_d
}
}
return true;
return _has_drop_selection(item, p_point);
}
return false;
editor/scene/scene_tree_editor.h
+1
View File
@@ -220,6 +220,7 @@ class SceneTreeEditor : public Control {
Timer *update_timer = nullptr;
LocalVector<StringName> *script_types;
bool _has_drop_selection(TreeItem *p_item, const Point2 &p_point) const;
bool _is_script_type(const StringName &p_type) const;
Vector<StringName> valid_types;