changeset 1709:54280e8b8309

improved scroll on slower machines patch by Stanislav Brabec
author nadvornik
date Tue, 28 Jul 2009 22:27:24 +0000
parents fc147a2d8aaf
children fce6debc934e
files src/pixbuf-renderer.c
diffstat 1 files changed, 14 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/pixbuf-renderer.c	Tue Jul 28 22:14:26 2009 +0000
+++ b/src/pixbuf-renderer.c	Tue Jul 28 22:27:24 2009 +0000
@@ -3746,6 +3746,13 @@
 	PixbufRenderer *pr;
 	gint accel;
 
+	/* This is a hack, but work far the best, at least for single pointer systems.
+	 * See http://bugzilla.gnome.org/show_bug.cgi?id=587714 for more. */
+	gint x, y;
+	gdk_window_get_pointer (bevent->window, &x, &y, NULL);
+	bevent->x = x;
+	bevent->y = y;
+
 	pr = PIXBUF_RENDERER(widget);
 
 	if (pr->scroller_id)
@@ -3787,6 +3794,11 @@
 	pr->drag_last_x = bevent->x;
 	pr->drag_last_y = bevent->y;
 
+	/* This is recommended by the GTK+ documentation, but does not work properly.
+	 * Use deprecated way until GTK+ gets a solution for correct motion hint handling:
+	 * http://bugzilla.gnome.org/show_bug.cgi?id=587714
+	 */
+	/* gdk_event_request_motions (bevent); */
 	return FALSE;
 }
 
@@ -3819,7 +3831,7 @@
 			pr->drag_last_y = bevent->y;
 			pr->drag_moved = 0;
 			gdk_pointer_grab(widget->window, FALSE,
-					 GDK_POINTER_MOTION_MASK | GDK_BUTTON_RELEASE_MASK,
+					 GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_RELEASE_MASK,
 					 NULL, NULL, bevent->time);
 			gtk_grab_add(widget);
 			break;
@@ -3919,7 +3931,7 @@
 	g_signal_connect(G_OBJECT(pr), "leave_notify_event",
 			 G_CALLBACK(pr_leave_notify_cb), pr);
 
-	gtk_widget_set_events(GTK_WIDGET(pr), GDK_POINTER_MOTION_MASK |
+	gtk_widget_set_events(GTK_WIDGET(pr), GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
 					      GDK_BUTTON_RELEASE_MASK | GDK_BUTTON_PRESS_MASK |
 					      GDK_LEAVE_NOTIFY_MASK);