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

Merge branch 'master' into blender2.8

Browse Source
This commit is contained in:
Campbell Barton
2018-06-15 19:12:44 +02:00
parent ecc57e7524 2b9edbc98b
commit 2291ce9f1f
1 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2547,24 +2547,34 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
return action;
if (ELEM(event->type, MOUSEMOVE, INBETWEEN_MOUSEMOVE)) {
if (event->check_drag) {
/* Test for CLICK_DRAG events. */
if (wm_action_not_handled(action)) {
if (event->check_drag) {
wmWindow *win = CTX_wm_window(C);
if ((abs(event->x - win->eventstate->prevclickx)) >= U.tweak_threshold ||
(abs(event->y - win->eventstate->prevclicky)) >= U.tweak_threshold)
{
short val = event->val;
short type = event->type;
event->val = KM_CLICK_DRAG;
event->type = win->eventstate->type;
CLOG_INFO(WM_LOG_HANDLERS, 1, "handling PRESS_DRAG");
action |= wm_handlers_do_intern(C, event, handlers);
event->val = val;
event->type = type;
win->eventstate->check_click = 0;
win->eventstate->check_drag = 0;
}
}
}
else {
wmWindow *win = CTX_wm_window(C);
if ((abs(event->x - win->eventstate->prevclickx)) >= U.tweak_threshold ||
(abs(event->y - win->eventstate->prevclicky)) >= U.tweak_threshold)
{
short val = event->val;
short type = event->type;
event->val = KM_CLICK_DRAG;
event->type = win->eventstate->type;
CLOG_INFO(WM_LOG_HANDLERS, 1, "handling PRESS_DRAG");
action |= wm_handlers_do_intern(C, event, handlers);
event->val = val;
event->type = type;
win->eventstate->check_click = 0;
if (win) {
win->eventstate->check_drag = 0;
}
}
@@ -2572,7 +2582,7 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
else if (ISMOUSE_BUTTON(event->type) || ISKEYBOARD(event->type)) {
/* All events that don't set wmEvent.prevtype must be ignored. */
/* test for CLICK events */
/* Test for CLICK events. */
if (wm_action_not_handled(action)) {
wmWindow *win = CTX_wm_window(C);
@@ -2624,9 +2634,9 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
}
else {
wmWindow *win = CTX_wm_window(C);
if (win)
if (win) {
win->eventstate->check_click = 0;
}
}
}