diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-10 10:10:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-10 10:10:43 +0400 |
| commit | 12c71a8c6866e345373127e976f55cb15aa73ded (patch) | |
| tree | b27c3b31b24a0359a49b60883b444307ba545b14 /source/blender/editors | |
| parent | 1a22503cba0336c148f969e63e5709d7a2df8aa1 (diff) | |
fix [#32384] Submenu hotkeys not working at all since 2.6x
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 6b8ed5fd997..53cd7f3fb58 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -6353,7 +6353,16 @@ static int ui_handle_menu_event(bContext *C, wmEvent *event, uiPopupBlockHandle } if (doit) { - ui_handle_button_activate(C, ar, but, BUTTON_ACTIVATE_APPLY); + /* activate buttons but open menu's */ + uiButtonActivateType activate; + if (but->type == PULLDOWN) { + activate = BUTTON_ACTIVATE_OPEN; + } + else { + activate = BUTTON_ACTIVATE_APPLY; + } + + ui_handle_button_activate(C, ar, but, activate); break; } } |