diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-21 20:29:22 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-21 20:29:22 +0300 |
| commit | 4f83fd4cf8b69497beddc498033a7a2beea24d80 (patch) | |
| tree | e976d3a728a9440cf09244601b53748a68ebd577 | |
| parent | c111eb0e9927ecfafd1173fc31dac4f04389e31e (diff) | |
| parent | 68f4a4641e637463125977adfc7c58d2c683e33b (diff) | |
Merge branch 'master' into blender2.8
| -rw-r--r-- | source/blender/windowmanager/intern/wm_event_system.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index a4efffdd8dd..6047f801037 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -2622,15 +2622,9 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers) } } else if (event->val == KM_DBL_CLICK) { + /* The underlying event is a press, so try and handle this. */ event->val = KM_PRESS; action |= wm_handlers_do_intern(C, event, handlers); - event->val = KM_RELEASE; - action |= wm_handlers_do_intern(C, event, handlers); - - if (wm_action_not_handled(action)) { - event->val = KM_CLICK; - action |= wm_handlers_do_intern(C, event, handlers); - } /* revert value if not handled */ if (wm_action_not_handled(action)) { @@ -3953,7 +3947,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U /* if previous event was same type, and previous was release, and now it presses... */ if (wm_event_is_double_click(&event, evt)) { CLOG_INFO(WM_LOG_HANDLERS, 1, "Send double click"); - evt->val = event.val = KM_DBL_CLICK; + event.val = KM_DBL_CLICK; } /* this case happens on holding a key pressed, it should not generate |