mousetweaks r355 - in branches/gnome-2-24: . src

[gerdk svn gnome org]

Author: gerdk
Date: Thu Nov 27 06:30:08 2008
New Revision: 355
URL: http://svn.gnome.org/viewvc/mousetweaks?rev=355&view=rev

Log:
2008-11-27  Gerd Kohlberger  <gerdk svn gnome org>

	* src/mt-main.c: (global_motion_event): Make sure drag-clicks also
	work if both Dwell Click and Simulated Secondary Click are enabled.
	Fixes bug #562212.



Modified:
   branches/gnome-2-24/ChangeLog
   branches/gnome-2-24/src/mt-main.c

Modified: branches/gnome-2-24/src/mt-main.c
==============================================================================
--- branches/gnome-2-24/src/mt-main.c	(original)
+++ branches/gnome-2-24/src/mt-main.c	Thu Nov 27 06:30:08 2008
@@ -420,6 +420,13 @@
 {
     MTClosure *mt = data;
 
+    if (mt_timer_is_running (mt->delay_timer)) {
+	if (!below_threshold (mt, event->x, event->y)) {
+	    mt_timer_stop (mt->delay_timer);
+	    mt_cursor_manager_restore_all (mt_cursor_manager_get_default ());
+	}
+    }
+
     if (mt->dwell_enabled) {
 	if (!below_threshold (mt, event->x, event->y) &&
 	    !mt->dwell_gesture_started) {
@@ -441,13 +448,6 @@
 	    mt->y_old = event->y;
 	}
     }
-
-    if (mt_timer_is_running (mt->delay_timer)) {
-	if (!below_threshold (mt, event->x, event->y)) {
-	    mt_timer_stop (mt->delay_timer);
-	    mt_cursor_manager_restore_all (mt_cursor_manager_get_default ());
-	}
-    }
 }
 
 static void