diff options
author | Philipp Oeser <info@graphics-engineer.com> | 2020-07-07 11:08:42 +0300 |
---|---|---|
committer | Philipp Oeser <info@graphics-engineer.com> | 2020-09-04 11:11:45 +0300 |
commit | 2a24b3aaf4c846a5d98f783fef69946584865df9 (patch) | |
tree | 34b33b8512d0bc821f5ada704c37a868046869f1 /source/blender/editors/interface/interface_template_search_menu.c | |
parent | 92b8d7019b4b484dc3120b26a27a59a3c7dc5489 (diff) |
Fix T78084: Search does not accept text fragments everywhere
This was reported for the "Add Node" search functionality, but is
relevant in other searches as well.
So e.g. when searching for "Separate XYZ", typing "sep", then " " (with
the intention to type "X" next) would clear the search field. Now use
the same method (matching against all search words) as in F3 searching
('menu_search_update_fn') in other searches as well [searching IDs,
property objects, finding nodes,...]
This should give a much nicer search experience in general.
Note: this does not touch other searches in the Dopesheet, Outliner,
Filebrowser or User Preferences that have other search implementations.
Maniphest Tasks: T78084
Differential Revision: https://developer.blender.org/D8232
Diffstat (limited to 'source/blender/editors/interface/interface_template_search_menu.c')
-rw-r--r-- | source/blender/editors/interface/interface_template_search_menu.c | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/source/blender/editors/interface/interface_template_search_menu.c b/source/blender/editors/interface/interface_template_search_menu.c index d148ff70751..667dcfd935d 100644 --- a/source/blender/editors/interface/interface_template_search_menu.c +++ b/source/blender/editors/interface/interface_template_search_menu.c @@ -992,23 +992,15 @@ static void menu_search_update_fn(const bContext *UNUSED(C), uiSearchItems *items) { struct MenuSearch_Data *data = arg; + + /* Prepare BLI_string_all_words_matched. */ const size_t str_len = strlen(str); - const int words_max = (str_len / 2) + 1; + const int words_max = BLI_string_max_possible_word_count(str_len); int(*words)[2] = BLI_array_alloca(words, words_max); - const int words_len = BLI_string_find_split_words(str, str_len, ' ', words, words_max); for (struct MenuSearch_Item *item = data->items.first; item; item = item->next) { - int index; - - /* match name against all search words */ - for (index = 0; index < words_len; index++) { - if (!ui_str_has_word_prefix(item->drawwstr_full, str + words[index][0], words[index][1])) { - break; - } - } - - if (index == words_len) { + if (BLI_string_all_words_matched(item->drawwstr_full, str, words, words_len)) { if (!UI_search_item_add(items, item->drawwstr_full, item, item->icon, item->state, 0)) { break; } |