[Bf-blender-cvs] [4c3b25e] master: Correct another issue in recent menu handling

Campbell Barton noreply at git.blender.org
Tue Aug 5 16:11:22 CEST 2014


Commit: 4c3b25ec9e8158ebddaedf66a3672dd30ee36fa4
Author: Campbell Barton
Date:   Wed Aug 6 00:05:20 2014 +1000
Branches: master
https://developer.blender.org/rB4c3b25ec9e8158ebddaedf66a3672dd30ee36fa4

Correct another issue in recent menu handling

mouse clicks to exit a menu were ignored for non-floating popups

===================================================================

M	source/blender/editors/interface/interface_handlers.c

===================================================================

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index 21bc3a6..24796c3 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;




More information about the Bf-blender-cvs mailing list