[Bf-blender-cvs] [784c99f] master: Correct glitch in recent menu commit, click-drag locked menus
Campbell Barton
noreply at git.blender.org
Sun Aug 3 22:04:15 CEST 2014
Commit: 784c99f53c1dbc27e5ffa04bda2410d74ce6d43a
Author: Campbell Barton
Date: Mon Aug 4 05:36:55 2014 +1000
Branches: master
https://developer.blender.org/rB784c99f53c1dbc27e5ffa04bda2410d74ce6d43a
Correct glitch in recent menu commit, click-drag locked menus
===================================================================
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 b5f11c2..21bc3a6 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -7882,7 +7882,10 @@ static int ui_handle_menu_button(bContext *C, const wmEvent *event, uiPopupBlock
if (but) {
/* Its possible there is an active menu item NOT under the mouse,
* in this case ignore mouse clicks outside the button (but Enter etc is accepted) */
- if ((event->type != MOUSEMOVE) && ISMOUSE(event->type)) {
+ if (event->val == KM_RELEASE) {
+ /* pass, needed so we can exit active menu-items when click-dragging out of them */
+ }
+ 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