From 4c3b25ec9e8158ebddaedf66a3672dd30ee36fa4 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 6 Aug 2014 00:05:20 +1000 Subject: [PATCH] Correct another issue in recent menu handling mouse clicks to exit a menu were ignored for non-floating popups --- source/blender/editors/interface/interface_handlers.c | 3 +++ 1 file changed, 3 insertions(+) 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;