From 4ec0a8705b86e589c32fc532280dc2e443c87f84 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 21 Jul 2022 15:23:32 +1000 Subject: [PATCH] WM: categorize smart-zoom as a gesture Event handling and the enum definition documents MOUSESMARTZOOM as a gesture however it wasn't accepted by ISMOUSE_GESTURE, instead it was added to the ISMOUSE macro. Move the type check to ISMOUSE_GESTURE. --- source/blender/windowmanager/wm_event_types.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/blender/windowmanager/wm_event_types.h b/source/blender/windowmanager/wm_event_types.h index edac3ada73b..2911c74e5a4 100644 --- a/source/blender/windowmanager/wm_event_types.h +++ b/source/blender/windowmanager/wm_event_types.h @@ -380,12 +380,11 @@ enum { (event_type) == EVT_OSKEY) /** Test whether the event is a mouse button. */ -#define ISMOUSE(event_type) \ - (((event_type) >= LEFTMOUSE && (event_type) <= BUTTON7MOUSE) || (event_type) == MOUSESMARTZOOM) +#define ISMOUSE(event_type) ((event_type) >= LEFTMOUSE && (event_type) <= BUTTON7MOUSE) /** Test whether the event is a mouse wheel. */ #define ISMOUSE_WHEEL(event_type) ((event_type) >= WHEELUPMOUSE && (event_type) <= WHEELOUTMOUSE) /** Test whether the event is a mouse (track-pad) gesture. */ -#define ISMOUSE_GESTURE(event_type) ((event_type) >= MOUSEPAN && (event_type) <= MOUSEROTATE) +#define ISMOUSE_GESTURE(event_type) ((event_type) >= MOUSEPAN && (event_type) <= MOUSESMARTZOOM) /** Test whether the event is a mouse button (excluding mouse-wheel). */ #define ISMOUSE_BUTTON(event_type) \ (ELEM(event_type, \