diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-09 04:22:32 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-09 04:22:32 +0300 |
| commit | d6152033420a7d5aed12c463b6d30fe957b12787 (patch) | |
| tree | 8d81dc38f5afc5c23eec49d15e45605cb630d700 /source/blender/windowmanager/wm_event_types.h | |
| parent | 3c3d80ea22af15e13237f978181a881b90c41e7c (diff) | |
Fix IS_EVENT_ACTIONZONE macro
Caused tweak events not to display.
Diffstat (limited to 'source/blender/windowmanager/wm_event_types.h')
| -rw-r--r-- | source/blender/windowmanager/wm_event_types.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index fad55171292..af3ca7b6ab7 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -308,11 +308,10 @@ enum { TIMERF = 0x011F, /* last timer */ /* Actionzones, tweak, gestures: 0x500x, 0x501x */ -#define EVT_ACTIONZONE_FIRST EVT_ACTIONZONE_AREA + /* Keep in sync with IS_EVENT_ACTIONZONE(...). */ EVT_ACTIONZONE_AREA = 0x5000, EVT_ACTIONZONE_REGION = 0x5001, EVT_ACTIONZONE_FULLSCREEN = 0x5011, -#define EVT_ACTIONZONE_LAST (EVT_ACTIONZONE_FULLSCREEN + 1) /* NOTE: these values are saved in keymap files, do not change them but just add new ones */ @@ -376,7 +375,8 @@ enum { /* test whether the event is a NDOF event */ #define ISNDOF(event_type) ((event_type) >= NDOF_MOTION && (event_type) < NDOF_LAST) -#define IS_EVENT_ACTIONZONE(event_type) ((event_type) >= EVT_ACTIONZONE_FIRST && (event_type) < EVT_ACTIONZONE_LAST) +#define IS_EVENT_ACTIONZONE(event_type) \ + ELEM(event_type, EVT_ACTIONZONE_AREA, EVT_ACTIONZONE_REGION, EVT_ACTIONZONE_FULLSCREEN) /* test whether event type is acceptable as hotkey, excluding modifiers */ #define ISHOTKEY(event_type) \ |