diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-08-03 23:36:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-08-04 00:03:56 +0400 |
| commit | 784c99f53c1dbc27e5ffa04bda2410d74ce6d43a (patch) | |
| tree | 98a94fe2318185a11ec196ab9ee11c2994349291 | |
| parent | 6fa6fa2fa243d54fd29f0a29d087c3824d9c88b8 (diff) | |
Correct glitch in recent menu commit, click-drag locked menus
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index b5f11c2a0f9..21bc3a69c3f 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; } |