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

WM: correct recent change to click/drag detection

Browse Source 
fb1915d870 - caused click/drag events not to be detected.

Now check a key is a mouse or keyboard event.
This commit is contained in:
Campbell Barton
2018-06-08 22:17:21 +02:00
parent 1857823839
commit 5165d62931
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2274,7 +2274,9 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
}
}
}
else if (!ELEM(event->type, EVENT_NONE) && !ISTIMER(event->type)) {
else if (ISMOUSE(event->type) || ISKEYBOARD(event->type)) {
/* All events that don't set wmEvent.prevtype must be ignored. */
/* test for CLICK events */
if (wm_action_not_handled(action)) {
wmWindow *win = CTX_wm_window(C);
@@ -2284,11 +2286,8 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
if (win != NULL) {
if (event->val == KM_PRESS) {
/* Ensure the types match to prevent mouse wheel from triggering drag/clicks. */
if (event->type == win->eventstate->prevtype) {
win->eventstate->check_click = true;
win->eventstate->check_drag = true;
}
win->eventstate->check_click = true;
win->eventstate->check_drag = true;
}
else if (event->val == KM_RELEASE) {
win->eventstate->check_drag = false;