diff options
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_region_search.cc | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 637ab822067..f947572f41b 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3551,6 +3551,12 @@ static void ui_textedit_end(bContext *C, uiBut *but, uiHandleButtonData *data) if ((ui_searchbox_apply(but, data->searchbox) == false) && (ui_searchbox_find_index(data->searchbox, but->editstr) == -1) && !but_search->results_are_suggestions) { + + if (but->flag & UI_BUT_VALUE_CLEAR) { + /* It is valid for _VALUE_CLEAR flavor to have no active element + * (it's a valid way to unlink). */ + but->editstr[0] = '\0'; + } data->cancel = true; /* ensure menu (popup) too is closed! */ diff --git a/source/blender/editors/interface/interface_region_search.cc b/source/blender/editors/interface/interface_region_search.cc index 5b30e922a67..f4c99fb3c16 100644 --- a/source/blender/editors/interface/interface_region_search.cc +++ b/source/blender/editors/interface/interface_region_search.cc @@ -115,7 +115,7 @@ bool UI_search_item_add(uiSearchItems *items, { /* hijack for autocomplete */ if (items->autocpl) { - UI_autocomplete_update_name(items->autocpl, name); + UI_autocomplete_update_name(items->autocpl, name + name_prefix_offset); return true; } @@ -313,13 +313,6 @@ bool ui_searchbox_apply(uiBut *but, ARegion *region) return true; } - if (but->flag & UI_BUT_VALUE_CLEAR) { - /* It is valid for _VALUE_CLEAR flavor to have no active element - * (it's a valid way to unlink). */ - but->editstr[0] = '\0'; - - return true; - } return false; } |