diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-09-10 14:53:22 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-09-10 14:53:22 +0400 |
commit | 965205d0e2c08aa005de0451dfda7380b9bc6221 (patch) | |
tree | a3b9640d6aa7483c08667204f17c64b1db3e5db4 /source/blender/editors/interface/interface_regions.c | |
parent | 1811ffff5d8cad4fea0f34fd7ee86e8726536137 (diff) |
Fix two bugs with searchbox UI items.
First one, reported by Sergey, was searchbox not closing when validating it (enter or LMB click)
without any active item (we need to enable escapecancel here, to close menu too).
Second one was SEARCH_MENU_UNLINK variant not unlinking at validation when no active item.
Thanks a bunch to Campbell for help here!
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
-rw-r--r-- | source/blender/editors/interface/interface_regions.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 291a9eb984f..9b450b8fdf4 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -888,6 +888,12 @@ bool ui_searchbox_apply(uiBut *but, ARegion *ar) return true; } + else if (but->type == SEARCH_MENU_UNLINK) { + /* It is valid for _UNLINK flavor to have no active element (it's a valid way to unlink). */ + but->editstr[0] = '\0'; + + return true; + } else { return false; } |