asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve sorting options in the asset library

Browse source 
The reverse sorting options are now integrated in the list of
sorting options, making the "Reverse" button unnecessary.
This pattern tends to be easier to discover by users.

The "Downloads" sorting option was also removed as it's not
implemented in the backend.
This commit is contained in:
Hugo Locurcio 2019-08-24 04:53:14 +02:00
parent 5323d24fad
commit a4a0295154
No known key found for this signature in database
GPG key ID: 39E8F8BE30B0A49C
2 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
editor/plugins/asset_library_editor_plugin.cpp
View file

@ -578,7 +578,6 @@ void EditorAssetLibrary::_notification(int p_what) {
case NOTIFICATION_READY: { case NOTIFICATION_READY: {
error_tr->set_texture(get_icon("Error", "EditorIcons")); error_tr->set_texture(get_icon("Error", "EditorIcons"));
reverse->set_icon(get_icon("Sort", "EditorIcons"));
filter->set_right_icon(get_icon("Search", "EditorIcons")); filter->set_right_icon(get_icon("Search", "EditorIcons"));
filter->set_clear_button_enabled(true); filter->set_clear_button_enabled(true);
@ -612,7 +611,6 @@ void EditorAssetLibrary::_notification(int p_what) {
library_scroll_bg->add_style_override("panel", get_stylebox("bg", "Tree")); library_scroll_bg->add_style_override("panel", get_stylebox("bg", "Tree"));
downloads_scroll->add_style_override("bg", get_stylebox("bg", "Tree")); downloads_scroll->add_style_override("bg", get_stylebox("bg", "Tree"));
error_tr->set_texture(get_icon("Error", "EditorIcons")); error_tr->set_texture(get_icon("Error", "EditorIcons"));
reverse->set_icon(get_icon("Sort", "EditorIcons"));
filter->set_right_icon(get_icon("Search", "EditorIcons")); filter->set_right_icon(get_icon("Search", "EditorIcons"));
filter->set_clear_button_enabled(true); filter->set_clear_button_enabled(true);
} break; } break;
@ -645,23 +643,27 @@ void EditorAssetLibrary::_install_asset() {
} }
const char *EditorAssetLibrary::sort_key[SORT_MAX] = { const char *EditorAssetLibrary::sort_key[SORT_MAX] = {
"downloads", "updated",
"updated",
"name",
"name", "name",
"cost", "cost",
"updated" "cost",
}; };
const char *EditorAssetLibrary::sort_text[SORT_MAX] = { const char *EditorAssetLibrary::sort_text[SORT_MAX] = {
"Downloads", "Recently Updated",
"Name", "Least Recently Updated",
"License", // "cost" stores the SPDX license name in the Godot Asset Library. "Name (A-Z)",
"Updated" "Name (Z-A)",
"License (A-Z)", // "cost" stores the SPDX license name in the Godot Asset Library.
"License (Z-A)", // "cost" stores the SPDX license name in the Godot Asset Library.
}; };
const char *EditorAssetLibrary::support_key[SUPPORT_MAX] = { const char *EditorAssetLibrary::support_key[SUPPORT_MAX] = {
"official", "official",
"community", "community",
"testing" "testing",
}; };
void EditorAssetLibrary::_select_author(int p_id) { void EditorAssetLibrary::_select_author(int p_id) {
@ -928,8 +930,8 @@ void EditorAssetLibrary::_search(int p_page) {
args += "&category=" + itos(categories->get_item_metadata(categories->get_selected())); args += "&category=" + itos(categories->get_item_metadata(categories->get_selected()));
} }
if (reverse->is_pressed()) { // Sorting options with an odd index are always the reverse of the previous one
if (sort->get_selected() % 2 == 1) {
args += "&reverse=true"; args += "&reverse=true";
} }
@ -1381,12 +1383,6 @@ EditorAssetLibrary::EditorAssetLibrary(bool p_templates_only) {
sort->set_h_size_flags(SIZE_EXPAND_FILL); sort->set_h_size_flags(SIZE_EXPAND_FILL);
sort->connect("item_selected", this, "_rerun_search"); sort->connect("item_selected", this, "_rerun_search");
reverse = memnew(ToolButton);
reverse->set_toggle_mode(true);
reverse->connect("toggled", this, "_rerun_search");
reverse->set_tooltip(TTR("Reverse sorting."));
search_hb2->add_child(reverse);
search_hb2->add_child(memnew(VSeparator)); search_hb2->add_child(memnew(VSeparator));
search_hb2->add_child(memnew(Label(TTR("Category:") + " "))); search_hb2->add_child(memnew(Label(TTR("Category:") + " ")));

9
editor/plugins/asset_library_editor_plugin.h
View file

@ -190,7 +190,6 @@ class EditorAssetLibrary : public PanelContainer {
OptionButton *categories; OptionButton *categories;
OptionButton *repository; OptionButton *repository;
OptionButton *sort; OptionButton *sort;
ToolButton *reverse;
Button *search; Button *search;
HBoxContainer *error_hb; HBoxContainer *error_hb;
TextureRect *error_tr; TextureRect *error_tr;
@ -216,10 +215,12 @@ class EditorAssetLibrary : public PanelContainer {
}; };
enum SortOrder { enum SortOrder {
SORT_DOWNLOADS,
SORT_NAME,
SORT_COST,
SORT_UPDATED, SORT_UPDATED,
SORT_UPDATED_REVERSE,
SORT_NAME,
SORT_NAME_REVERSE,
SORT_COST,
SORT_COST_REVERSE,
SORT_MAX SORT_MAX
}; };