[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53840] trunk/blender/source/blender/ windowmanager/intern/wm_event_system.c: don' t check for mouse-movement if the double click event isn' t on a mouse-button.

Campbell Barton ideasman42 at gmail.com
Wed Jan 16 05:23:58 CET 2013


Revision: 53840
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53840
Author:   campbellbarton
Date:     2013-01-16 04:23:55 +0000 (Wed, 16 Jan 2013)
Log Message:
-----------
don't check for mouse-movement if the double click event isn't on a mouse-button.

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-01-16 04:17:34 UTC (rev 53839)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-01-16 04:23:55 UTC (rev 53840)
@@ -2749,11 +2749,20 @@
 
 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))
-	        );
+	if ((event->type == event_state->prevtype) &&
+	    (event_state->prevval == KM_RELEASE) &&
+	    (event->val == KM_PRESS))
+	{
+		if ((ISMOUSE(event->type) == false) || ((ABS(event->x - event_state->prevclickx)) <= 2 &&
+		                                        (ABS(event->y - event_state->prevclicky)) <= 2))
+		{
+			if ((PIL_check_seconds_timer() - event_state->prevclicktime) * 1000 < U.dbl_click_time) {
+				return true;
+			}
+		}
+	}
+
+	return false;
 }
 
 /* windows store own event queues, no bContext here */




More information about the Bf-blender-cvs mailing list