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

Improved search in settings dialogs 

Settings search used to work only on properties, so if a searchbox text
was a substring of a category but not of a property the whole category
would be filtered out and no property would be shown.

Now the behaviour is changed so that when the searchbox text is a
substring of a category all its properties are shown too.

The previous behaviour is still present so that in case the searchbox
text is both a substring of a category and a property of another
category, all properties of the first category are shown and only the
property of the second category is shown.
This commit is contained in:
Silvano Cerza 2019-10-24 21:56:05 +02:00
parent dc114fa2ef
commit 84410f937e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
editor/editor_inspector.cpp
View File

@ -1595,7 +1595,7 @@ void EditorInspector::update_tree() {
if (capitalize_paths) if (capitalize_paths)
cat = cat.capitalize(); cat = cat.capitalize();
if (!filter.is_subsequence_ofi(cat) && !filter.is_subsequence_ofi(name)) if (!filter.is_subsequence_ofi(cat) && !filter.is_subsequence_ofi(name) && property_prefix.to_lower().find(filter.to_lower()) == -1)
continue; continue;
} }

6
editor/editor_sectioned_inspector.cpp
View File

@ -245,6 +245,9 @@ void SectionedInspector::update_category_list() {
if (pi.name.find(":") != -1 || pi.name == "script" || pi.name == "resource_name" || pi.name == "resource_path" || pi.name == "resource_local_to_scene" || pi.name.begins_with("_global_script")) if (pi.name.find(":") != -1 || pi.name == "script" || pi.name == "resource_name" || pi.name == "resource_path" || pi.name == "resource_local_to_scene" || pi.name.begins_with("_global_script"))
continue; continue;
if (!filter.empty() && !filter.is_subsequence_ofi(pi.name) && !filter.is_subsequence_ofi(pi.name.replace("/", " ").capitalize()))
continue;
int sp = pi.name.find("/"); int sp = pi.name.find("/");
if (sp == -1) if (sp == -1)
pi.name = "global/" + pi.name; pi.name = "global/" + pi.name;
@ -252,9 +255,6 @@ void SectionedInspector::update_category_list() {
Vector<String> sectionarr = pi.name.split("/"); Vector<String> sectionarr = pi.name.split("/");
String metasection; String metasection;
if (!filter.empty() && !filter.is_subsequence_ofi(sectionarr[sectionarr.size() - 1].capitalize()))
continue;
int sc = MIN(2, sectionarr.size() - 1); int sc = MIN(2, sectionarr.size() - 1);
for (int i = 0; i < sc; i++) { for (int i = 0; i < sc; i++) {