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

Merge pull request #41376 from Calinou/improve-editor-property-selector 

Improve search and display in the editor property/method selector
This commit is contained in:
Rémi Verschelde 2020-08-21 14:11:13 +02:00 committed by GitHub
parent b0ca859501 4390a9d628
commit bf48b0976e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
editor/property_selector.cpp
View File

@ -84,6 +84,9 @@ void PropertySelector::_update_search() {
TreeItem *root = search_options->create_item(); TreeItem *root = search_options->create_item();
// Allow using spaces in place of underscores in the search string (makes the search more fault-tolerant).
const String search_text = search_box->get_text().replace(" ", "_");
if (properties) { if (properties) {
List<PropertyInfo> props; List<PropertyInfo> props;
@ -167,7 +170,7 @@ void PropertySelector::_update_search() {
continue; continue;
} }
if (search_box->get_text() != String() && E->get().name.find(search_box->get_text()) == -1) { if (search_box->get_text() != String() && E->get().name.findn(search_text) == -1) {
continue; continue;
} }
@ -180,7 +183,7 @@ void PropertySelector::_update_search() {
item->set_metadata(0, E->get().name); item->set_metadata(0, E->get().name);
item->set_icon(0, type_icons[E->get().type]); item->set_icon(0, type_icons[E->get().type]);
if (!found && search_box->get_text() != String() && E->get().name.find(search_box->get_text()) != -1) { if (!found && search_box->get_text() != String() && E->get().name.findn(search_text) != -1) {
item->select(0); item->select(0);
found = true; found = true;
} }
@ -255,7 +258,7 @@ void PropertySelector::_update_search() {
continue; continue;
} }
if (search_box->get_text() != String() && name.find(search_box->get_text()) == -1) { if (search_box->get_text() != String() && name.findn(search_text) == -1) {
continue; continue;
} }
@ -270,29 +273,29 @@ void PropertySelector::_update_search() {
} else if (mi.return_val.type != Variant::NIL) { } else if (mi.return_val.type != Variant::NIL) {
desc = Variant::get_type_name(mi.return_val.type); desc = Variant::get_type_name(mi.return_val.type);
} else { } else {
desc = "void "; desc = "void";
} }
desc += " " + mi.name + " ( "; desc += vformat(" %s(", mi.name);
for (int i = 0; i < mi.arguments.size(); i++) { for (int i = 0; i < mi.arguments.size(); i++) {
if (i > 0) { if (i > 0) {
desc += ", "; desc += ", ";
} }
desc += mi.arguments[i].name;
if (mi.arguments[i].type == Variant::NIL) { if (mi.arguments[i].type == Variant::NIL) {
desc += "var "; desc += ": Variant";
} else if (mi.arguments[i].name.find(":") != -1) { } else if (mi.arguments[i].name.find(":") != -1) {
desc += mi.arguments[i].name.get_slice(":", 1) + " "; desc += vformat(": %s", mi.arguments[i].name.get_slice(":", 1));
mi.arguments[i].name = mi.arguments[i].name.get_slice(":", 0); mi.arguments[i].name = mi.arguments[i].name.get_slice(":", 0);
} else { } else {
desc += Variant::get_type_name(mi.arguments[i].type) + " "; desc += vformat(": %s", Variant::get_type_name(mi.arguments[i].type));
} }
desc += mi.arguments[i].name;
} }
desc += " )"; desc += ")";
if (E->get().flags & METHOD_FLAG_CONST) { if (E->get().flags & METHOD_FLAG_CONST) {
desc += " const"; desc += " const";
@ -306,7 +309,7 @@ void PropertySelector::_update_search() {
item->set_metadata(0, name); item->set_metadata(0, name);
item->set_selectable(0, true); item->set_selectable(0, true);
if (!found && search_box->get_text() != String() && name.find(search_box->get_text()) != -1) { if (!found && search_box->get_text() != String() && name.findn(search_text) != -1) {
item->select(0); item->select(0);
found = true; found = true;
} }