godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #68697 from MewPurPur/dependency-editor-thinks-every-resource-is-scene 

Fix "View Owners" dialog not acknowledging that some resources aren't scenes
This commit is contained in:
Yuri Sizov 2023-06-06 12:29:50 +02:00 committed by GitHub
parent 2e728e02cc d7eefc3b1c
commit 9fbbb4592d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
editor/dependency_editor.cpp
View File

@ -286,10 +286,23 @@ void DependencyEditorOwners::_list_rmb_clicked(int p_item, const Vector2 &p_pos,
file_options->clear(); file_options->clear();
file_options->reset_size(); file_options->reset_size();
if (p_item >= 0) { if (p_item >= 0) {
if (owners->get_selected_items().size() == 1) { PackedInt32Array selected_items = owners->get_selected_items();
file_options->add_icon_item(get_theme_icon(SNAME("Load"), SNAME("EditorIcons")), TTR("Open Scene"), FILE_OPEN); bool only_scenes_selected = true;
for (int i = 0; i < selected_items.size(); i++) {
int item_idx = selected_items[i];
if (ResourceLoader::get_resource_type(owners->get_item_text(item_idx)) != "PackedScene") {
only_scenes_selected = false;
break;
}
}
if (only_scenes_selected) {
file_options->add_icon_item(get_theme_icon(SNAME("Load"), SNAME("EditorIcons")), TTRN("Open Scene", "Open Scenes", selected_items.size()), FILE_OPEN);
} else if (selected_items.size() == 1) {
file_options->add_icon_item(get_theme_icon(SNAME("Load"), SNAME("EditorIcons")), TTR("Open"), FILE_OPEN);
} else { } else {
file_options->add_icon_item(get_theme_icon(SNAME("Load"), SNAME("EditorIcons")), TTR("Open Scenes"), FILE_OPEN); return;
} }
} }
@ -303,9 +316,19 @@ void DependencyEditorOwners::_select_file(int p_idx) {
if (ResourceLoader::get_resource_type(fpath) == "PackedScene") { if (ResourceLoader::get_resource_type(fpath) == "PackedScene") {
EditorNode::get_singleton()->open_request(fpath); EditorNode::get_singleton()->open_request(fpath);
hide(); } else {
emit_signal(SNAME("confirmed")); EditorNode::get_singleton()->load_resource(fpath);
} }
hide();
emit_signal(SNAME("confirmed"));
}
void DependencyEditorOwners::_empty_clicked(const Vector2 &p_pos, MouseButton p_mouse_button_index) {
if (p_mouse_button_index != MouseButton::LEFT) {
return;
}
owners->deselect_all();
} }
void DependencyEditorOwners::_file_option(int p_option) { void DependencyEditorOwners::_file_option(int p_option) {
@ -372,6 +395,7 @@ DependencyEditorOwners::DependencyEditorOwners() {
owners->set_select_mode(ItemList::SELECT_MULTI); owners->set_select_mode(ItemList::SELECT_MULTI);
owners->connect("item_clicked", callable_mp(this, &DependencyEditorOwners::_list_rmb_clicked)); owners->connect("item_clicked", callable_mp(this, &DependencyEditorOwners::_list_rmb_clicked));
owners->connect("item_activated", callable_mp(this, &DependencyEditorOwners::_select_file)); owners->connect("item_activated", callable_mp(this, &DependencyEditorOwners::_select_file));
owners->connect("empty_clicked", callable_mp(this, &DependencyEditorOwners::_empty_clicked));
owners->set_allow_rmb_select(true); owners->set_allow_rmb_select(true);
add_child(owners); add_child(owners);
} }

1
editor/dependency_editor.h
View File

@ -80,6 +80,7 @@ class DependencyEditorOwners : public AcceptDialog {
static void _bind_methods(); static void _bind_methods();
void _list_rmb_clicked(int p_item, const Vector2 &p_pos, MouseButton p_mouse_button_index); void _list_rmb_clicked(int p_item, const Vector2 &p_pos, MouseButton p_mouse_button_index);
void _select_file(int p_idx); void _select_file(int p_idx);
void _empty_clicked(const Vector2 &p_pos, MouseButton p_mouse_button_index);
void _file_option(int p_option); void _file_option(int p_option);
private: private: