Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

move double click check into its own function.

Browse Source
This commit is contained in:
Campbell Barton
2013-01-16 04:17:34 +00:00
parent d0e65f2bf4
commit 4d65a3297d
1 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2747,6 +2747,15 @@ static wmWindow *wm_event_cursor_other_windows(wmWindowManager *wm, wmWindow *wi
return NULL; return NULL;
} }
static bool wm_event_is_double_click(wmEvent *event, wmEvent *event_state)
{
return (((event->type == event_state->prevtype && event_state->prevval == KM_RELEASE && event->val == KM_PRESS)) &&
((ABS(event->x - event_state->prevclickx)) <= 2 &&
(ABS(event->y - event_state->prevclicky)) <= 2 &&
((PIL_check_seconds_timer() - event_state->prevclicktime) * 1000 < U.dbl_click_time))
);
}
/* windows store own event queues, no bContext here */ /* windows store own event queues, no bContext here */
/* time is in 1000s of seconds, from ghost */ /* time is in 1000s of seconds, from ghost */
void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int UNUSED(time), void *customdata) void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int UNUSED(time), void *customdata)
@@ -2868,15 +2877,10 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
} }
/* double click test */ /* double click test */
if (event.type == evt->prevtype && event.val == KM_PRESS) { if (wm_event_is_double_click(&event, evt)) {
if ((ABS(event.x - evt->prevclickx)) <= 2 && if (G.debug & (G_DEBUG_HANDLERS | G_DEBUG_EVENTS) )
(ABS(event.y - evt->prevclicky)) <= 2 && printf("%s Send double click\n", __func__);
((PIL_check_seconds_timer() - evt->prevclicktime) * 1000 < U.dbl_click_time)) event.val = KM_DBL_CLICK;
{
if (G.debug & (G_DEBUG_HANDLERS | G_DEBUG_EVENTS) )
printf("%s Send double click\n", __func__);
event.val = KM_DBL_CLICK;
}
} }
if (event.val == KM_PRESS) { if (event.val == KM_PRESS) {
evt->prevclicktime = PIL_check_seconds_timer(); evt->prevclicktime = PIL_check_seconds_timer();
@@ -2982,15 +2986,10 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
/* double click test */ /* double click test */
/* if previous event was same type, and previous was release, and now it presses... */ /* if previous event was same type, and previous was release, and now it presses... */
if (event.type == evt->prevtype && evt->prevval == KM_RELEASE && event.val == KM_PRESS) { if (wm_event_is_double_click(&event, evt)) {
if ((ABS(event.x - evt->prevclickx)) <= 2 && if (G.debug & (G_DEBUG_HANDLERS | G_DEBUG_EVENTS) )
(ABS(event.y - evt->prevclicky)) <= 2 && printf("%s Send double click\n", __func__);
((PIL_check_seconds_timer() - evt->prevclicktime) * 1000 < U.dbl_click_time)) evt->val = event.val = KM_DBL_CLICK;
{
if (G.debug & (G_DEBUG_HANDLERS | G_DEBUG_EVENTS) )
printf("%s Send double click\n", __func__);
evt->val = event.val = KM_DBL_CLICK;
}
} }
/* this case happens on holding a key pressed, it should not generate /* this case happens on holding a key pressed, it should not generate