diff options
| author | Ton Roosendaal <ton@blender.org> | 2012-10-26 19:21:31 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2012-10-26 19:21:31 +0400 |
| commit | 37bf6ef04405222adbfe0970e51b679ee99054ac (patch) | |
| tree | 0d37b7472d27a8fb5ef7bec4af0f7a2dbc3e3bdc /source/blender/windowmanager/intern/wm_keymap.c | |
| parent | d24aaf5958c7a7e4d08991ae801e39032138a1ff (diff) | |
Bugfix #28734
Double clicks were never working reliably in Blender - this mostly because
it wasn't a real event, but something generated in the handler code.
Now it is an actual event - meaning it always gets handled (if you have
a keymap item for it of course), but if there's no doubleclick handling
it treats the doubleclick as a normal click.
Also cleaned code. No recursion anymore.
Diffstat (limited to 'source/blender/windowmanager/intern/wm_keymap.c')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_keymap.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_keymap.c b/source/blender/windowmanager/intern/wm_keymap.c index bcddc984ed3..02dc77171d5 100644 --- a/source/blender/windowmanager/intern/wm_keymap.c +++ b/source/blender/windowmanager/intern/wm_keymap.c @@ -957,11 +957,6 @@ int WM_keymap_item_compare(wmKeyMapItem *k1, wmKeyMapItem *k2) return 0; if (k1->val != KM_ANY && k2->val != KM_ANY) { - /* take click, press, release conflict into account */ - if (k1->val == KM_CLICK && ELEM3(k2->val, KM_PRESS, KM_RELEASE, KM_CLICK) == 0) - return 0; - if (k2->val == KM_CLICK && ELEM3(k1->val, KM_PRESS, KM_RELEASE, KM_CLICK) == 0) - return 0; if (k1->val != k2->val) return 0; } |