diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-12 02:55:27 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-12 02:55:27 +0400 |
| commit | ed6215bff10710e5d0ff39faac3ab7516c71561c (patch) | |
| tree | a2edcca2cab40f5e6e533cf83d12ed4ec7ba5f93 /source | |
| parent | f0ea636b677aa8a47415cfdabd4eba27d2cb3446 (diff) | |
a-z menu input now works for enum popups.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 718ed40cad9..a82f77280b8 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -759,7 +759,7 @@ static void ui_menu_block_set_keyaccels(uiBlock *block) * fun first pass on all buttons so first word chars always get first priority */ for (but = block->buttons.first; but; but = but->next) { - if (!ELEM4(but->type, BUT, MENU, BLOCK, PULLDOWN) || (but->flag & UI_HIDDEN)) { + if (!ELEM5(but->type, BUT, BUTM, MENU, BLOCK, PULLDOWN) || (but->flag & UI_HIDDEN)) { /* pass */ } else if (but->menu_key == '\0') { diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 17486edd07f..b5f3a1e59e9 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6414,7 +6414,7 @@ static int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle for (but = block->buttons.first; but; but = but->next) { if (but->menu_key == event->type) { - if (but->type == BUT) { + if (ELEM(but->type, BUT, BUTM)) { /* mainly for operator buttons */ ui_handle_button_activate(C, ar, but, BUTTON_ACTIVATE_APPLY); } |