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

Merge pull request #80914 from jsjtxietian/init-importer-default-correctly

Browse Source 
Fix "Import Defaults" selector not being initialized incorrectly
This commit is contained in:
Yuri Sizov
2023-08-25 21:26:34 +02:00
parent ffdb4662fe f997feed75
commit 3c71214a70
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
editor/import_defaults_editor.cpp
View File

@ -167,15 +167,13 @@ void ImportDefaultsEditor::_importer_selected(int p_index) {
void ImportDefaultsEditor::clear() { void ImportDefaultsEditor::clear() {
String last_selected; String last_selected;
if (importers->get_selected() > 0) {
if (importers->get_selected() >= 0) {
last_selected = importers->get_item_text(importers->get_selected()); last_selected = importers->get_item_text(importers->get_selected());
} }
importers->clear(); importers->clear();
importers->add_item("<" + TTR("Select Importer") + ">");
importers->set_item_disabled(0, true);
List<Ref<ResourceImporter>> importer_list; List<Ref<ResourceImporter>> importer_list;
ResourceFormatImporter::get_singleton()->get_importers(&importer_list); ResourceFormatImporter::get_singleton()->get_importers(&importer_list);
Vector<String> names; Vector<String> names;
@ -185,11 +183,17 @@ void ImportDefaultsEditor::clear() {
} }
names.sort(); names.sort();
// `last_selected.is_empty()` means it's the first time being called.
if (last_selected.is_empty() && !names.is_empty()) {
last_selected = names[0];
}
for (int i = 0; i < names.size(); i++) { for (int i = 0; i < names.size(); i++) {
importers->add_item(names[i]); importers->add_item(names[i]);
if (names[i] == last_selected) { if (names[i] == last_selected) {
importers->select(i + 1); importers->select(i);
_update_importer();
} }
} }
} }