diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-31 11:45:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-31 11:45:37 +0100 |
| commit | 1361fa71c419a44c9a5849a599fa745efe9052cf (patch) | |
| tree | 66e20249568e21231873d12805b0811aa2bfead0 /editor | |
| parent | d75c3d7f49e80bb2112ac9f09bbfd586895011de (diff) | |
| parent | 84410f937e6504f72e8a35becf237049b640b39f (diff) | |
Merge pull request #33047 from silvanocerza/settings-search
Improved search in settings dialogs
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/editor_inspector.cpp | 2 | ||||
| -rw-r--r-- | editor/editor_sectioned_inspector.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/editor/editor_inspector.cpp b/editor/editor_inspector.cpp index 56da7d93fa..7c1e58862e 100644 --- a/editor/editor_inspector.cpp +++ b/editor/editor_inspector.cpp @@ -1596,7 +1596,7 @@ void EditorInspector::update_tree() { if (capitalize_paths) 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; } diff --git a/editor/editor_sectioned_inspector.cpp b/editor/editor_sectioned_inspector.cpp index 28825b45e1..2090c12c91 100644 --- a/editor/editor_sectioned_inspector.cpp +++ b/editor/editor_sectioned_inspector.cpp @@ -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")) continue; + if (!filter.empty() && !filter.is_subsequence_ofi(pi.name) && !filter.is_subsequence_ofi(pi.name.replace("/", " ").capitalize())) + continue; + int sp = pi.name.find("/"); if (sp == -1) pi.name = "global/" + pi.name; @@ -252,9 +255,6 @@ void SectionedInspector::update_category_list() { Vector<String> sectionarr = pi.name.split("/"); String metasection; - if (!filter.empty() && !filter.is_subsequence_ofi(sectionarr[sectionarr.size() - 1].capitalize())) - continue; - int sc = MIN(2, sectionarr.size() - 1); for (int i = 0; i < sc; i++) { |