From a4b0ffe1deefc1f580308db9151d60589e515119 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Tue, 23 Sep 2008 11:15:38 +0000 Subject: [PATCH] 2008-09-23 Emmanuele Bassi 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) --- ChangeLog | 9 +++++++++ clutter/clutter-actor.c | 5 +---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31e0a6e8a..6ba684e09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-09-23 Emmanuele Bassi + + 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 Bug 1125 - Save an extra pango_layout_get_size in many cases diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index bfb2412e9..f24389ef0 100644 --- 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