diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-12-06 04:27:13 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-12-06 04:28:05 +0300 |
| commit | c8995ecc835d6fa7093bd76dd4ba031ac27465bd (patch) | |
| tree | d2e74f613cc028c322daafb32af46feaf120ea00 /source | |
| parent | 871cf701445a6a9c8aa39f1ac6809aebe7d49e56 (diff) | |
Fix inbetween mousemove event getting detected in hotkey buttons.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index c841370a8fd..3a312808cee 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -3063,10 +3063,10 @@ static int ui_do_but_HOTKEYEVT(bContext *C, uiBut *but, uiHandleButtonData *data } } else if (data->state == BUTTON_STATE_WAIT_KEY_EVENT) { - - if (event->type == MOUSEMOVE) + if (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)) { return WM_UI_HANDLER_CONTINUE; - + } + if (event->type == LEFTMOUSE && event->val == KM_PRESS) { /* only cancel if click outside the button */ if (ui_but_contains_point_px(but->active->region, but, event->x, event->y) == 0) { |