diff options
author | Hans Goudey <h.goudey@me.com> | 2021-12-13 22:57:55 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2021-12-13 22:58:30 +0300 |
commit | 0606adceb3b6efa020c7389bdb31fe541b7d1d5f (patch) | |
tree | f61b37c6f495c8e5643e1ee4a3fd5803e2b1d4fc /source/blender/blenlib/intern | |
parent | a90c3564676649aa4a0b74112c852a75de6d3521 (diff) |
UI: String Search: Add an optional weight parameter
This builds off of rBf951aa063f7, adding a weight parameter which can
be used to change the order of items when they have the same match
score. In the future, if string searching gets a C++ API, we could
use an optional parameter for the weight, since it is not used yet.
This will be used for the node link drag search menu (D8286).
Differential Revision: https://developer.blender.org/D13559
Diffstat (limited to 'source/blender/blenlib/intern')
-rw-r--r-- | source/blender/blenlib/intern/string_search.cc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/source/blender/blenlib/intern/string_search.cc b/source/blender/blenlib/intern/string_search.cc index 02b0b814659..c5528dce2f2 100644 --- a/source/blender/blenlib/intern/string_search.cc +++ b/source/blender/blenlib/intern/string_search.cc @@ -389,6 +389,7 @@ struct SearchItem { blender::Span<blender::StringRef> normalized_words; int length; void *user_data; + int weight; }; struct StringSearch { @@ -401,14 +402,19 @@ StringSearch *BLI_string_search_new() return new StringSearch(); } -void BLI_string_search_add(StringSearch *search, const char *str, void *user_data) +void BLI_string_search_add(StringSearch *search, + const char *str, + void *user_data, + const int weight) { using namespace blender; Vector<StringRef, 64> words; StringRef str_ref{str}; string_search::extract_normalized_words(str_ref, search->allocator, words); - search->items.append( - {search->allocator.construct_array_copy(words.as_span()), (int)str_ref.size(), user_data}); + search->items.append({search->allocator.construct_array_copy(words.as_span()), + (int)str_ref.size(), + user_data, + weight}); } int BLI_string_search_query(StringSearch *search, const char *query, void ***r_data) @@ -449,6 +455,11 @@ int BLI_string_search_query(StringSearch *search, const char *query, void ***r_d std::sort(indices.begin(), indices.end(), [&](int a, int b) { return search->items[a].length < search->items[b].length; }); + /* Prefer items with larger weights. Use `stable_sort` so that if the weights are the same, + * the order won't be changed. */ + std::stable_sort(indices.begin(), indices.end(), [&](int a, int b) { + return search->items[a].weight > search->items[b].weight; + }); } sorted_result_indices.extend(indices); } |