[maemo-commits] [maemo-commits] r9577 - in projects/haf/branches/gtk+/maemo-gtk-2-10: . gtk

[From: subversion at stage.maemo.org]

Author: kris
Date: 2007-02-02 16:48:43 +0200 (Fri, 02 Feb 2007)
New Revision: 9577

Modified:
   projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
   projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c
Log:
2007-02-02  Kristian Rietveld  <kris at imendio.com>

	* gtk/gtktreeview.c (gtk_tree_view_stop_rubber_band),
	(gtk_tree_view_update_rubber_band_selection): make the cursor
	follow the stylus during pen dragging,
	(gtk_tree_view_update_rubber_band): do not invalidate region
	of the rubber banding rectangle since we don't draw it.



Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-02 14:47:20 UTC (rev 9576)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/ChangeLog	2007-02-02 14:48:43 UTC (rev 9577)
@@ -1,5 +1,13 @@
 2007-02-02  Kristian Rietveld  <kris at imendio.com>
 
+	* gtk/gtktreeview.c (gtk_tree_view_stop_rubber_band),
+	(gtk_tree_view_update_rubber_band_selection): make the cursor
+	follow the stylus during pen dragging,
+	(gtk_tree_view_update_rubber_band): do not invalidate region
+	of the rubber banding rectangle since we don't draw it.
+
+2007-02-02  Kristian Rietveld  <kris at imendio.com>
+
 	* gtk/gtktreeprivate.h (struct _GtkTreePrivate): add
 	queued_expand_row and queued_activate_row fields.
 

Modified: projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c
===================================================================
--- projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c	2007-02-02 14:47:20 UTC (rev 9576)
+++ projects/haf/branches/gtk+/maemo-gtk-2-10/gtk/gtktreeview.c	2007-02-02 14:48:43 UTC (rev 9577)
@@ -3862,12 +3862,14 @@
 
       gtk_tree_path_free (tmp_path);
 
+#ifndef MAEMO_CHANGES
       /* ... and the cursor to the end path */
       tmp_path = _gtk_tree_view_find_path (tree_view,
 					   tree_view->priv->rubber_band_end_tree,
 					   tree_view->priv->rubber_band_end_node);
       gtk_tree_view_real_set_cursor (GTK_TREE_VIEW (tree_view), tmp_path, FALSE, FALSE);
       gtk_tree_path_free (tmp_path);
+#endif /* !MAEMO_CHANGES */
 
       _gtk_tree_selection_emit_changed (tree_view->priv->selection);
     }
@@ -3989,6 +3991,9 @@
 {
   GtkRBTree *start_tree, *end_tree;
   GtkRBNode *start_node, *end_node;
+#ifdef MAEMO_CHANGES
+  GtkTreePath *path;
+#endif /* MAEMO_CHANGES */
 
   _gtk_rbtree_find_offset (tree_view->priv->tree, MIN (tree_view->priv->press_start_y, tree_view->priv->rubber_band_y), &start_tree, &start_node);
   _gtk_rbtree_find_offset (tree_view->priv->tree, MAX (tree_view->priv->press_start_y, tree_view->priv->rubber_band_y), &end_tree, &end_node);
@@ -4087,6 +4092,20 @@
 
   tree_view->priv->rubber_band_end_tree = end_tree;
   tree_view->priv->rubber_band_end_node = end_node;
+
+#ifdef MAEMO_CHANGES
+  /* In maemo the cursor needs to follow the stylus */
+  if (gtk_tree_view_get_path_at_pos (tree_view,
+				     tree_view->priv->rubber_band_x,
+				     RBTREE_Y_TO_TREE_WINDOW_Y (tree_view, tree_view->priv->rubber_band_y),
+				     &path,
+				     NULL, NULL, NULL))
+    {
+      gtk_tree_view_real_set_cursor (tree_view, path, FALSE, FALSE);
+      gtk_tree_path_free (path);
+    }
+
+#endif /* MAEMO_CHANGES */
 }
 
 static void
@@ -4113,6 +4132,7 @@
   new_area.width = ABS (x - tree_view->priv->press_start_x) + 1;
   new_area.height = ABS (y - tree_view->priv->press_start_y) + 1;
 
+#ifndef MAEMO_CHANGES
   invalid_region = gdk_region_rectangle (&old_area);
   gdk_region_union_with_rect (invalid_region, &new_area);
 
@@ -4136,6 +4156,7 @@
   gdk_window_invalidate_region (tree_view->priv->bin_window, invalid_region, TRUE);
 
   gdk_region_destroy (invalid_region);
+#endif /* !MAEMO_CHANGES */
 
   tree_view->priv->rubber_band_x = x;
   tree_view->priv->rubber_band_y = y;