blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Correct glitch in recent menu commit, click-drag locked menus

This commit is contained in:
Campbell Barton 2014-08-04 05:36:55 +10:00
parent 6fa6fa2fa2
commit 784c99f53c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/interface/interface_handlers.c
View File

@ -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;
}