blender
/
blender
136
406
Fork 588
Code Issues 6.2k Pull Requests 752 Projects 19 Wiki Activity

Cleanup: minor change to click detection checks 

Change order of checks for more convenient click-detection debugging.
This commit is contained in:
Campbell Barton 2021-03-01 12:21:57 +11:00
parent 1638af109e
commit 72d1545ec2
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2999,29 +2999,32 @@ static int wm_handlers_do(bContext *C, wmEvent *event, ListBase *handlers)
if (win && win->eventstate->prevtype == event->type) {
if ((event->val == KM_RELEASE) && (win->eventstate->prevval == KM_PRESS) &&
(win->eventstate->check_click == true)) {
if (WM_event_drag_test(event, &win->eventstate->prevclickx)) {
win->eventstate->check_click = 0;
win->eventstate->check_drag = 0;
}
else {
/* Position is where the actual click happens, for more
* accurate selecting in case the mouse drifts a little. */
int x = event->x;
int y = event->y;
if (event->val == KM_RELEASE) {
if (win->eventstate->prevval == KM_PRESS) {
if (win->eventstate->check_click == true) {
if (WM_event_drag_test(event, &win->eventstate->prevclickx)) {
win->eventstate->check_click = 0;
win->eventstate->check_drag = 0;
}
else {
/* Position is where the actual click happens, for more
* accurate selecting in case the mouse drifts a little. */
int x = event->x;
int y = event->y;
event->x = win->eventstate->prevclickx;
event->y = win->eventstate->prevclicky;
event->val = KM_CLICK;
event->x = event->prevclickx;
event->y = event->prevclicky;
event->val = KM_CLICK;
CLOG_INFO(WM_LOG_HANDLERS, 1, "handling CLICK");
CLOG_INFO(WM_LOG_HANDLERS, 1, "handling CLICK");
action |= wm_handlers_do_intern(C, event, handlers);
action |= wm_handlers_do_intern(C, event, handlers);
event->val = KM_RELEASE;
event->x = x;
event->y = y;
event->val = KM_RELEASE;
event->x = x;
event->y = y;
}
}
}
}
else if (event->val == KM_DBL_CLICK) {