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

Merge pull request #46985 from jmb462/Fix-Asset-Library-URL-editor-update

Browse Source 
Fix Asset Library URLs not updating without restarting after been changed in editor settings (Fix #46977)
This commit is contained in:
Rémi Verschelde 2021-03-14 00:20:38 +01:00 committed by GitHub
commit f381ea8bb6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
editor/plugins/asset_library_editor_plugin.cpp
View File

@ -584,6 +584,24 @@ void EditorAssetLibrary::_notification(int p_what) {
filter->set_right_icon(get_theme_icon("Search", "EditorIcons")); filter->set_right_icon(get_theme_icon("Search", "EditorIcons"));
filter->set_clear_button_enabled(true); filter->set_clear_button_enabled(true);
} break; } break;
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
_update_repository_options();
} break;
}
}
void EditorAssetLibrary::_update_repository_options() {
Dictionary default_urls;
default_urls["godotengine.org"] = "https://godotengine.org/asset-library/api";
default_urls["localhost"] = "http://127.0.0.1/asset-library/api";
Dictionary available_urls = _EDITOR_DEF("asset_library/available_urls", default_urls, true);
repository->clear();
Array keys = available_urls.keys();
for (int i = 0; i < available_urls.size(); i++) {
String key = keys[i];
repository->add_item(key);
repository->set_item_metadata(i, available_urls[key]);
} }
} }
@ -1373,18 +1391,7 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
search_hb2->add_child(memnew(Label(TTR("Site:") + " "))); search_hb2->add_child(memnew(Label(TTR("Site:") + " ")));
repository = memnew(OptionButton); repository = memnew(OptionButton);
{ _update_repository_options();
Dictionary default_urls;
default_urls["godotengine.org"] = "https://godotengine.org/asset-library/api";
default_urls["localhost"] = "http://127.0.0.1/asset-library/api";
Dictionary available_urls = _EDITOR_DEF("asset_library/available_urls", default_urls, true);
Array keys = available_urls.keys();
for (int i = 0; i < available_urls.size(); i++) {
String key = keys[i];
repository->add_item(key);
repository->set_item_metadata(i, available_urls[key]);
}
}
repository->connect("item_selected", callable_mp(this, &EditorAssetLibrary::_repository_changed)); repository->connect("item_selected", callable_mp(this, &EditorAssetLibrary::_repository_changed));

1
editor/plugins/asset_library_editor_plugin.h
View File

@ -176,6 +176,7 @@ class EditorAssetLibrary : public PanelContainer {
void _asset_open(); void _asset_open();
void _asset_file_selected(const String &p_file); void _asset_file_selected(const String &p_file);
void _update_repository_options();
PanelContainer *library_scroll_bg; PanelContainer *library_scroll_bg;
ScrollContainer *library_scroll; ScrollContainer *library_scroll;