Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTon Roosendaal <ton@blender.org>2012-10-31 22:47:49 +0400
committerTon Roosendaal <ton@blender.org>2012-10-31 22:47:49 +0400
commitae097e72a35f4cff8eaa242b7b17f596c2051907 (patch)
tree2f9e21e0aec181e38d14660c140e4298674e30eb /source/blender
parentca23999b2cf7344c3cfddf9652c53cad02dc95ab (diff)
Bugfix #33031
Holding down non-modifer keys was generating double-clicks - my fault!
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/windowmanager/intern/wm_event_system.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 06ae3848b6f..ffcbf399d5a 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -2961,7 +2961,8 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
}
/* double click test */
- if (event.type == evt->prevtype && event.val == KM_PRESS) {
+ /* 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 ((ABS(event.x - evt->prevclickx)) <= 2 &&
(ABS(event.y - evt->prevclicky)) <= 2 &&
((PIL_check_seconds_timer() - evt->prevclicktime) * 1000 < U.dbl_click_time))
@@ -2988,6 +2989,7 @@ void wm_event_add_ghostevent(wmWindowManager *wm, wmWindow *win, int type, int U
if (event.type == ESCKEY && event.val == KM_PRESS)
G.is_break = TRUE;
+ /* double click test - only for press */
if (event.val == KM_PRESS) {
evt->prevclicktime = PIL_check_seconds_timer();
evt->prevclickx = event.x;