diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-18 16:12:55 +0400 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2014-08-18 16:13:55 +0400 |
| commit | de12cd706f1f9f12f675dfc118ae68b2c0701d82 (patch) | |
| tree | 2f635d2cb9f8c69f1e2dbb05257fa5392cbd3949 /source/blender/editors/interface/interface_handlers.c | |
| parent | 71ce415f4a48cf8915ba921594c96c09b54191a3 (diff) | |
Fix T41426: floating menus - scroll issues.
Do not reset active but if cursor is not over it when getting mousewheel events.
Diffstat (limited to 'source/blender/editors/interface/interface_handlers.c')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index ac4da00833f..166090c95ca 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -7951,7 +7951,7 @@ static int ui_handle_menu_button(bContext *C, const wmEvent *event, uiPopupBlock 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)) { + else if ((!ELEM(event->type, MOUSEMOVE, WHEELUPMOUSE, WHEELDOWNMOUSE, MOUSEPAN)) && ISMOUSE(event->type)) { if (!ui_mouse_inside_button(but->active->region, but, event->x, event->y)) { but = NULL; } |