diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-08-05 18:05:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-05 18:06:38 +0400 |
| commit | 4c3b25ec9e8158ebddaedf66a3672dd30ee36fa4 (patch) | |
| tree | 46672c74c9a129d6200b935c30248432dca88770 | |
| parent | 4071719ae76a05265aafc46638880c29578f7553 (diff) | |
Correct another issue in recent menu handling
mouse clicks to exit a menu were ignored for non-floating popups
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 21bc3a69c3f..24796c370dc 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -7885,6 +7885,9 @@ static int ui_handle_menu_button(bContext *C, const wmEvent *event, uiPopupBlock if (event->val == KM_RELEASE) { /* pass, needed so we can exit active menu-items when click-dragging out of them */ } + else if (!ui_mouse_inside_region(but->active->region, event->x, event->y)) { + /* pass, needed to click-exit outside of non-flaoting menus */ + } else if ((event->type != MOUSEMOVE) && ISMOUSE(event->type)) { if (!ui_mouse_inside_button(but->active->region, but, event->x, event->y)) { but = NULL; |