[maemo-commits] [maemo-commits] r13649 - in projects/haf/trunk/gtk+: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-09-06 17:53:44 +0300 (Thu, 06 Sep 2007)
New Revision: 13649

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2007-09-06  Kristian Rietveld  <kris at imendio.com>

	Delay vertical auto scrolling until an additional row has been
	selected via pen dragging. (Fixes NB#60326).

	* gtk/gtktreeview.c (gtk_tree_view_update_rubber_band_selection):
	start scrolling after an additional row has been selected via
	pen dragging,
	(gtk_tree_view_motion_bin_window): don't edge scrolling as soon as
	we receive a motion event.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-06 14:51:39 UTC (rev 13648)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-06 14:53:44 UTC (rev 13649)
@@ -1,5 +1,16 @@
 2007-09-06  Kristian Rietveld  <kris at imendio.com>
 
+	Delay vertical auto scrolling until an additional row has been
+	selected via pen dragging. (Fixes NB#60326).
+
+	* gtk/gtktreeview.c (gtk_tree_view_update_rubber_band_selection):
+	start scrolling after an additional row has been selected via
+	pen dragging,
+	(gtk_tree_view_motion_bin_window): don't edge scrolling as soon as
+	we receive a motion event.
+
+2007-09-06  Kristian Rietveld  <kris at imendio.com>
+
 	* gtk/gtktreeview.c (gtk_tree_view_focus): bail out if can-focus is
 	FALSE. (NB#65181).
 

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-06 14:51:39 UTC (rev 13648)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-06 14:53:44 UTC (rev 13649)
@@ -4027,6 +4027,10 @@
 	    GTK_RBNODE_UNSET_FLAG (start_node, GTK_RBNODE_IS_SELECTED);
 	}
 
+#ifdef MAEMO_CHANGES
+      add_scroll_timeout (tree_view);
+#endif /* MAEMO_CHANGES */
+
       _gtk_tree_view_queue_draw_node (tree_view, start_tree, start_node, NULL);
 
 #ifdef MAEMO_CHANGES
@@ -4324,7 +4328,9 @@
     {
       gtk_tree_view_update_rubber_band (tree_view);
 
+#ifndef MAEMO_CHANGES
       add_scroll_timeout (tree_view);
+#endif /* MAEMO_CHANGES */
     }
 
   /* only check for an initiated drag when a button is pressed */