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

[From: subversion at stage.maemo.org]

Author: xan
Date: 2007-09-26 16:37:04 +0300 (Wed, 26 Sep 2007)
New Revision: 14121

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtkiconview.c
Log:
2007-09-26  Xan Lopez  <xan.lopez at nokia.com>

	Patch by Michael Kostrzewa.

	* gtk/gtkiconview.c (gtk_icon_view_paint_item): use gtk_paint_flat_box
	instead of cairo to get theming right. Fixes: NB#70554


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2007-09-26 13:36:20 UTC (rev 14120)
+++ projects/haf/trunk/gtk+/ChangeLog	2007-09-26 13:37:04 UTC (rev 14121)
@@ -1,3 +1,10 @@
+2007-09-26  Xan Lopez  <xan.lopez at nokia.com>
+
+	Patch by Michael Kostrzewa.
+	
+	* gtk/gtkiconview.c (gtk_icon_view_paint_item): use gtk_paint_flat_box
+	instead of cairo to get theming right. Fixes: NB#70554
+
 2007-09-25  Tommi Komulainen  <tommi.komulainen at nokia.com>
 
 	* gtk/gtkentry.c (gtk_entry_class_init, gtk_entry_init): Make the

Modified: projects/haf/trunk/gtk+/gtk/gtkiconview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtkiconview.c	2007-09-26 13:36:20 UTC (rev 14120)
+++ projects/haf/trunk/gtk+/gtk/gtkiconview.c	2007-09-26 13:37:04 UTC (rev 14121)
@@ -2957,14 +2957,15 @@
   if (item->selected)
 #ifdef MAEMO_CHANGES
     {
-      gdk_cairo_set_source_color (cr, &GTK_WIDGET (icon_view)->style->base[state]);
-
-      cairo_rectangle (cr,
-          	       x, 
-          	       y,
-          	       item->width, item->height);
-
-      cairo_fill (cr);
+      gtk_paint_flat_box (GTK_WIDGET (icon_view)->style,
+                          (GdkWindow *) drawable,
+                          GTK_STATE_SELECTED,
+                          GTK_SHADOW_NONE,
+                          area,
+                          GTK_WIDGET (icon_view),
+                          "icon_view_item",
+                          x, y,
+                          item->width, item->height);
     }
 #else
     for (l = icon_view->priv->cell_list; l; l = l->next)
@@ -3009,7 +3010,7 @@
 			  cell_area.width, cell_area.height);
 
       gtk_icon_view_get_cell_box (icon_view, item, info, &box);
- 
+	  
       gdk_draw_rectangle (drawable,
 			  GTK_WIDGET (icon_view)->style->black_gc,
 			  FALSE,