griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-06-21 19:29:22 +02:00
parent c111eb0e99 68f4a4641e
commit 4f83fd4cf8
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/blender/windowmanager/intern/wm_event_system.c
View File

@@ -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