[maemo-commits] [maemo-commits] r13454 - in projects/haf/trunk/hildon-desktop: . libhildondesktop

[From: subversion at stage.maemo.org]

Author: jobi
Date: 2007-08-29 14:06:41 +0300 (Wed, 29 Aug 2007)
New Revision: 13454

Modified:
   projects/haf/trunk/hildon-desktop/ChangeLog
   projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
Log:

2007-08-29  Johan Bilien  <johan.bilien at nokia.com>

	* libhildondesktop/hildon-home-area.c:
	- also recalculate mask after the state of a child is back to
	normal, if necessary. Fixes: NB#65895



Modified: projects/haf/trunk/hildon-desktop/ChangeLog
===================================================================
--- projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-29 10:56:12 UTC (rev 13453)
+++ projects/haf/trunk/hildon-desktop/ChangeLog	2007-08-29 11:06:41 UTC (rev 13454)
@@ -1,3 +1,9 @@
+2007-08-29  Johan Bilien  <johan.bilien at nokia.com>
+
+	* libhildondesktop/hildon-home-area.c:
+	- also recalculate mask after the state of a child is back to
+	normal, if necessary. Fixes: NB#65895
+
 2007-08-29  Lucas Rocha  <lucas.rocha at nokia.com>
 
 	* libhildondesktop/libhildonmenu.[ch]: remove useless xmlreader.h

Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c
===================================================================
--- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-08-29 10:56:12 UTC (rev 13453)
+++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-home-area.c	2007-08-29 11:06:41 UTC (rev 13454)
@@ -75,7 +75,7 @@
   gint          stack_index;
   gulong        realize_handler;
 #ifdef HAVE_X_COMPOSITE
-  GtkAllocation old_allocation;
+  gint          mask_width, mask_height;
   Damage        damage;
   Picture       picture;
   Picture       alpha_mask;
@@ -956,12 +956,10 @@
                            NULL);
 
   if (state == 0 && /* not moving or resizing */
-      (data->old_allocation.width  != allocation->width ||
-       data->old_allocation.height != allocation->height))
+      (data->mask_width  != allocation->width ||
+       data->mask_height != allocation->height))
     hildon_home_area_child_build_alpha_mask (area, child);
 
-  data->old_allocation = *allocation;
-
 }
 
 static void
@@ -1198,6 +1196,9 @@
                         borders->left + center_w, borders->top + center_h,
                         borders->right, borders->bottom);
 
+      child_data->mask_width = w;
+      child_data->mask_height = h;
+
       XFreePixmap (GDK_DISPLAY (), p);
       g_free (borders);
     }
@@ -1217,6 +1218,12 @@
 
   child_data->state = state;
 
+  if (state == 0 && /* not moving or resizing */
+      (child_data->mask_width  != child_data->widget->allocation.width ||
+       child_data->mask_height != child_data->widget->allocation.height))
+    hildon_home_area_child_build_alpha_mask (HILDON_HOME_AREA (child_data->widget->parent),
+                                             child_data->widget);
+
 }