blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Geometry Nodes: Sort attribute search items when menu opens 

Because the search didn't run when the menu first opens, the attributes
appeared in a different order than after you typed anything into the
search field. This commit instead runs the search when the menu
is first opened, but it only sorts items without filtering.
This commit is contained in:
Hans Goudey 2021-03-05 14:45:09 -06:00
parent 4addcf1efc
commit becc36cce5
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/space_node/node_geometry_attribute_search.cc
View File

@ -75,15 +75,9 @@ static void attribute_search_update_fn(
UI_search_item_add(items, str, (void *)str, ICON_X, 0, 0);
}
/* Skip the filter when the menu is first opened, so all of the items are visible. */
if (is_first) {
for (const std::string &attribute_name : attribute_name_hints) {
/* Just use the pointer to the name string as the search data,
* since it's not used anyway but we need a pointer. */
UI_search_item_add(items, attribute_name.c_str(), (void *)&attribute_name, ICON_NONE, 0, 0);
}
return;
}
/* Don't filter when the menu is first opened, but still run the search
* so the items are in the same order they will appear in while searching. */
const char *string = is_first ? "" : str;
StringSearch *search = BLI_string_search_new();
for (const std::string &attribute_name : attribute_name_hints) {
@ -91,7 +85,7 @@ static void attribute_search_update_fn(
}
std::string **filtered_items;
const int filtered_amount = BLI_string_search_query(search, str, (void ***)&filtered_items);
const int filtered_amount = BLI_string_search_query(search, string, (void ***)&filtered_items);
for (const int i : IndexRange(filtered_amount)) {
std::string *item = filtered_items[i];