brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Only reset the relayout_pending flag when actually doing a relayout

Browse Source 
If an actor is (unfortunately) queuing a relayout in relayout, you would
end up with (ClutterActor*)stage->needs_allocation set to TRUE and
stage->relayout_pending set to TRUE. But if then in the same cycle, an
actor calls clutter_actor_get_allocation_box, that will trigger another
(recursive) _clutter_stage_maybe_relayout, which will wrongly reset the
relayout pending to FALSE, while not actually performing a new relayout
because of the re-entrancy protection.

http://bugzilla.clutter-project.org/show_bug.cgi?id=2503
This commit is contained in:
Johan Bilien 2010-12-29 16:57:02 -05:00 committed by Emmanuele Bassi
parent b6558c5a18
commit c95cc8d477
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clutter/clutter-stage.c
View File

@ -761,11 +761,12 @@ _clutter_stage_maybe_relayout (ClutterActor *actor)
if (!priv->relayout_pending) if (!priv->relayout_pending)
return; return;
priv->relayout_pending = FALSE;
/* avoid reentrancy */ /* avoid reentrancy */
if (!CLUTTER_ACTOR_IN_RELAYOUT (stage)) if (!CLUTTER_ACTOR_IN_RELAYOUT (stage))
{ {
priv->relayout_pending = FALSE;
CLUTTER_TIMER_START (_clutter_uprof_context, relayout_timer); CLUTTER_TIMER_START (_clutter_uprof_context, relayout_timer);
CLUTTER_NOTE (ACTOR, "Recomputing layout"); CLUTTER_NOTE (ACTOR, "Recomputing layout");