2008-09-23 Emmanuele Bassi <ebassi@linux.intel.com>

	Bug 1124 - Clutter causes an additional size request in each
	allocation

	* clutter/clutter-actor.c:
	(clutter_actor_store_old_geometry): Store the allocation instead
	of causing a new size-request cycle. (Johan Bilien)

diff --git a/ChangeLog b/ChangeLog
index 31e0a6e..6ba684e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2008-09-23  Emmanuele Bassi  <ebassi@linux.intel.com>
 
+       Bug 1124 - Clutter causes an additional size request in each
+       allocation
+
+       * clutter/clutter-actor.c:
+       (clutter_actor_store_old_geometry): Store the allocation instead
+       of causing a new size-request cycle. (Johan Bilien)
+
+2008-09-23  Emmanuele Bassi  <ebassi@linux.intel.com>
+
        Bug 1125 - Save an extra pango_layout_get_size in many cases
 
        * clutter/clutter-label.c:

diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c
index bfb2412..f24389e 100644 (file)
--- a/clutter/clutter-actor.c
+++ b/clutter/clutter-actor.c
@@ -710,10 +710,7 @@ static void
 clutter_actor_store_old_geometry (ClutterActor    *self,
                                   ClutterActorBox *box)
 {
-  box->x1 = clutter_actor_get_xu (self);
-  box->y1 = clutter_actor_get_yu (self);
-  box->x2 = box->x1 + clutter_actor_get_widthu (self);
-  box->y2 = box->y1 + clutter_actor_get_heightu (self);
+  *box = self->priv->allocation;
 }
 
 static inline void