archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

WM: add macros to check mouse button/gesture/wheel

Browse Source 
Use to check click/drag,
fixes issue with mouse wheel triggering pie menu.
This commit is contained in:
Campbell Barton
2018-06-10 12:08:09 +02:00
parent ae01df5779
commit d0a16772ad
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -2274,7 +2274,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
}
}
}
else if (ISMOUSE(event->type) || ISKEYBOARD(event->type)) {
else if (ISMOUSE_BUTTON(event->type) || ISKEYBOARD(event->type)) {
/* All events that don't set wmEvent.prevtype must be ignored. */
/* test for CLICK events */

7
source/blender/windowmanager/wm_event_types.h
View File

@@ -366,6 +366,13 @@ enum {
/* test whether the event is a mouse button */
#define ISMOUSE(event_type) ((event_type) >= LEFTMOUSE && (event_type) <= BUTTON7MOUSE)
#define ISMOUSE_WHEEL(event_type) ((event_type) >= WHEELUPMOUSE && (event_type) <= WHEELOUTMOUSE)
#define ISMOUSE_GESTURE(event_type) ((event_type) >= MOUSEPAN && (event_type) <= MOUSEROTATE)
#define ISMOUSE_BUTTON(event_type) \
(ELEM(event_type, \
LEFTMOUSE, MIDDLEMOUSE, RIGHTMOUSE, ACTIONMOUSE, SELECTMOUSE, \
BUTTON4MOUSE, BUTTON5MOUSE, BUTTON6MOUSE, BUTTON7MOUSE))
/* test whether the event is tweak event */
#define ISTWEAK(event_type) ((event_type) >= EVT_TWEAK_L && (event_type) <= EVT_GESTURE)