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

[From: subversion at stage.maemo.org]

Author: tko
Date: 2007-09-28 15:42:33 +0300 (Fri, 28 Sep 2007)
New Revision: 14178

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
Don't paint focus rectangle around cells when there's only one

2007-09-28  Tommi Komulainen  <tommi.komulainen at nokia.com>

	* gtk/gtktreeview.c (gtk_tree_view_has_special_cell): (MAEMO_CHANGES)
	Return TRUE when there's more than one special cell as we don't want
	the focus rectangle around cells when there's only one. In such case
	Select key is expected to activate the cell so there's no ambiguity.
	NB#70703


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-28 12:33:53 UTC (rev 14177)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-28 12:42:33 UTC (rev 14178)
@@ -1,3 +1,11 @@
+2007-09-28  Tommi Komulainen  <tommi.komulainen at nokia.com>
+
+	* gtk/gtktreeview.c (gtk_tree_view_has_special_cell): (MAEMO_CHANGES)
+	Return TRUE when there's more than one special cell as we don't want
+	the focus rectangle around cells when there's only one. In such case
+	Select key is expected to activate the cell so there's no ambiguity.
+	NB#70703
+
 2007-09-28  Xan Lopez  <xan.lopez at nokia.com>
 
 	* gtk/gtknotebook.c (gtk_notebook_paint): paint the box_gap with the

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-28 12:33:53 UTC (rev 14177)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2007-09-28 12:42:33 UTC (rev 14178)
@@ -8027,13 +8027,22 @@
 gtk_tree_view_has_special_cell (GtkTreeView *tree_view)
 {
   GList *list;
+#ifdef MAEMO_CHANGES
+  guint n_specials = 0;
+#endif /* MAEMO_CHANGES */
 
   for (list = tree_view->priv->columns; list; list = list->next)
     {
       if (!((GtkTreeViewColumn *)list->data)->visible)
 	continue;
+#ifdef MAEMO_CHANGES
+      n_specials += _gtk_tree_view_column_count_special_cells (list->data);
+      if (n_specials > 1)
+	return TRUE;
+#else /* MAEMO_CHANGES */
       if (_gtk_tree_view_column_count_special_cells (list->data))
 	return TRUE;
+#endif /* MAEMO_CHANGES */
     }
 
   return FALSE;