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

[From: subversion at stage.maemo.org]

Author: kris
Date: 2009-05-18 11:39:52 +0300 (Mon, 18 May 2009)
New Revision: 18413

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2009-05-18  Kristian Rietveld  <kris at imendio.com>

	Fixes: NB#116994 - clear private data item selection cannot be
	toggled by tapping anywhere on the item

	* gtk/gtktreeview.c (gtk_tree_view_button_press): treat clicks
	on the tickmark in multiple selection mode as clicks on the last
	column.



Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-05-18 08:22:07 UTC (rev 18412)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-05-18 08:39:52 UTC (rev 18413)
@@ -1,3 +1,12 @@
+2009-05-18  Kristian Rietveld  <kris at imendio.com>
+
+	Fixes: NB#116994 - clear private data item selection cannot be
+	toggled by tapping anywhere on the item
+
+	* gtk/gtktreeview.c (gtk_tree_view_button_press): treat clicks
+	on the tickmark in multiple selection mode as clicks on the last
+	column.
+
 2009-05-11  Claudio Saavedra  <csaavedra at igalia.com>
 
 	Released 2:2.12.12-1maemo16

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-05-18 08:22:07 UTC (rev 18412)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-05-18 08:39:52 UTC (rev 18413)
@@ -2983,6 +2983,23 @@
 	  break;
 	}
 
+#ifdef MAEMO_CHANGES
+      gtk_widget_style_get (widget,
+                            "hildon-mode", &mode,
+                            NULL);
+
+      if (mode == HILDON_FREMANTLE
+          && tree_view->priv->hildon_ui_mode == HILDON_UI_MODE_EDIT
+          && tree_view->priv->selection->type == GTK_SELECTION_MULTIPLE
+          && (gint)event->x < background_area.x + HILDON_TICK_MARK_SIZE)
+        {
+          GList *list;
+
+          list = (rtl ? g_list_first (tree_view->priv->columns) : g_list_last (tree_view->priv->columns));
+          column = list->data;
+        }
+#endif /* MAEMO_CHANGES */
+
       if (column == NULL)
 	{
 	  gtk_tree_path_free (path);
@@ -3060,10 +3077,6 @@
 	}
 
 #ifdef MAEMO_CHANGES
-      gtk_widget_style_get (widget,
-                            "hildon-mode", &mode,
-                            NULL);
-
       node_selected = GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED);
       node_is_selectable =
 	_gtk_tree_selection_row_is_selectable (tree_view->priv->selection,