[Bf-blender-cvs] [f2c64517b59] master: Fix T74607: Modifier key click events ignore mouse wheel

[Campbell Barton]

Commit: f2c64517b59bb3205f7174687d90d93b24174aac
Author: Campbell Barton
Date:   Wed Mar 11 20:03:10 2020 +1100
Branches: master
https://developer.blender.org/rBf2c64517b59bb3205f7174687d90d93b24174aac

Fix T74607: Modifier key click events ignore mouse wheel

Alt-Wheel would sent Alt-Click event, prompting to switch tools.

===================================================================

M	source/blender/windowmanager/intern/wm_event_system.c

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 8728c887feb..7e78a0224ce 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2915,6 +2915,21 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
       }
     }
   }
+  else if (ISMOUSE_WHEEL(event->type) || ISMOUSE_GESTURE(event->type)) {
+    /* Modifiers which can trigger click event's,
+     * however we don't want this if the mouse wheel has been used, see T74607. */
+    if (wm_action_not_handled(action)) {
+      /* pass */
+    }
+    else {
+      wmWindow *win = CTX_wm_window(C);
+      if (win) {
+        if (ISKEYMODIFIER(win->eventstate->prevtype)) {
+          win->eventstate->check_click = 0;
+        }
+      }
+    }
+  }
 
   return action;
 }