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

Fix tool leader-key consuming mouse wheel events

Browse Source
This commit is contained in:
Campbell Barton
2019-11-08 17:41:04 +11:00
parent 0a42d0c566
commit 45a03057fa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
release/scripts/startup/bl_operators/wm.py
View File

@@ -1823,12 +1823,15 @@ class WM_OT_toolbar_prompt(Operator):
event_type = event.type event_type = event.type
event_value = event.value event_value = event.value
keymap = self._keymap if event_type in {
'LEFTMOUSE', 'RIGHTMOUSE', 'MIDDLEMOUSE',
if event_type in {'LEFTMOUSE', 'RIGHTMOUSE', 'MIDDLEMOUSE', 'ESC'}: 'WHEELDOWNMOUSE', 'WHEELUPMOUSE', 'WHEELINMOUSE', 'WHEELOUTMOUSE',
'ESC',
}:
context.workspace.status_text_set(None) context.workspace.status_text_set(None)
return {'CANCELLED', 'PASS_THROUGH'} return {'CANCELLED', 'PASS_THROUGH'}
keymap = self._keymap
item = keymap.keymap_items.match_event(event) item = keymap.keymap_items.match_event(event)
if item is not None: if item is not None:
idname = item.idname idname = item.idname