diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-11-08 09:41:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-11-08 09:41:04 +0300 |
| commit | 45a03057fa33e043b08027a8353d133948b85ca8 (patch) | |
| tree | 0cb063600222fe401bdb03ad71085479b66d3410 /release | |
| parent | 0a42d0c5667097d755b66297009160183ddba8c8 (diff) | |
Fix tool leader-key consuming mouse wheel events
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_operators/wm.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_operators/wm.py b/release/scripts/startup/bl_operators/wm.py index d576eaee40d..63aaf1d319a 100644 --- a/release/scripts/startup/bl_operators/wm.py +++ b/release/scripts/startup/bl_operators/wm.py @@ -1823,12 +1823,15 @@ class WM_OT_toolbar_prompt(Operator): event_type = event.type event_value = event.value - keymap = self._keymap - - if event_type in {'LEFTMOUSE', 'RIGHTMOUSE', 'MIDDLEMOUSE', 'ESC'}: + if event_type in { + 'LEFTMOUSE', 'RIGHTMOUSE', 'MIDDLEMOUSE', + 'WHEELDOWNMOUSE', 'WHEELUPMOUSE', 'WHEELINMOUSE', 'WHEELOUTMOUSE', + 'ESC', + }: context.workspace.status_text_set(None) return {'CANCELLED', 'PASS_THROUGH'} + keymap = self._keymap item = keymap.keymap_items.match_event(event) if item is not None: idname = item.idname |