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

[From: subversion at stage.maemo.org]

Author: herzi
Date: 2009-08-06 15:42:31 +0300 (Thu, 06 Aug 2009)
New Revision: 19079

Modified:
   projects/haf/trunk/gtk+/ChangeLog
   projects/haf/trunk/gtk+/gtk/gtktreeview.c
Log:
2009-08-06  Sven Herzberg  <herzi at lanedo.com>

	Fixes: NB#89864 - [AF Checked] RGBA support

	* gtk/gtktreeview.c (gtk_tree_view_realize),
	(gtk_tree_view_bin_expose): make sure the window between the widget's
	parent window and the bin_window (and header_window) also gets
	expose-events (to trigger the composition magic from
	gdk_window_end_paint)


Modified: projects/haf/trunk/gtk+/ChangeLog
===================================================================
--- projects/haf/trunk/gtk+/ChangeLog	2009-08-06 12:41:53 UTC (rev 19078)
+++ projects/haf/trunk/gtk+/ChangeLog	2009-08-06 12:42:31 UTC (rev 19079)
@@ -1,3 +1,13 @@
+2009-08-06  Sven Herzberg  <herzi at lanedo.com>
+
+	Fixes: NB#89864 - [AF Checked] RGBA support
+
+	* gtk/gtktreeview.c (gtk_tree_view_realize),
+	(gtk_tree_view_bin_expose): make sure the window between the widget's
+	parent window and the bin_window (and header_window) also gets
+	expose-events (to trigger the composition magic from
+	gdk_window_end_paint)
+
 2009-08-06  Sven Herzberg  <sven at lanedo.com>
 
 	About: NB#89864 - RGBA support

Modified: projects/haf/trunk/gtk+/gtk/gtktreeview.c
===================================================================
--- projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-08-06 12:41:53 UTC (rev 19078)
+++ projects/haf/trunk/gtk+/gtk/gtktreeview.c	2009-08-06 12:42:31 UTC (rev 19079)
@@ -2071,6 +2071,9 @@
   attributes.visual = gtk_widget_get_visual (widget);
   attributes.colormap = gtk_widget_get_colormap (widget);
   attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK;
+#ifdef MAEMO_CHANGES
+  attributes.event_mask |= GDK_EXPOSURE_MASK;
+#endif
 
   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL | GDK_WA_COLORMAP;
 
@@ -5091,6 +5094,12 @@
   gint expose_start;
   gboolean render_checkboxes = FALSE;
   HildonMode mode;
+
+  if (event->window == widget->window)
+    {
+      /* don't actually expose the window; we just added exposure for the composition to work */
+      return FALSE;
+    }
 #endif /* MAEMO_CHANGES */
 
   rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);