mirror of
https://github.com/brl/mutter.git
synced 2024-11-23 00:20:42 -05:00
actor: Check CluterActorMeta:enabled
Instead of delegating the check for the ActorMeta:enabled property to the sub-classes of ClutterActorMeta, ClutterActor can do the check prior to using the ClutterActorMeta instances.
This commit is contained in:
parent
3f6b82c9c9
commit
91a9a355c3
@ -2280,6 +2280,10 @@ _clutter_actor_effects_pre_paint (ClutterActor *self)
|
|||||||
for (l = effects; l != NULL; l = l->next)
|
for (l = effects; l != NULL; l = l->next)
|
||||||
{
|
{
|
||||||
ClutterEffect *effect = l->data;
|
ClutterEffect *effect = l->data;
|
||||||
|
ClutterActorMeta *meta = l->data;
|
||||||
|
|
||||||
|
if (!clutter_actor_meta_get_enabled (meta))
|
||||||
|
continue;
|
||||||
|
|
||||||
priv->current_effect = l->data;
|
priv->current_effect = l->data;
|
||||||
|
|
||||||
@ -2304,6 +2308,10 @@ _clutter_actor_effects_post_paint (ClutterActor *self)
|
|||||||
for (l = g_list_last ((GList *) effects); l != NULL; l = l->prev)
|
for (l = g_list_last ((GList *) effects); l != NULL; l = l->prev)
|
||||||
{
|
{
|
||||||
ClutterEffect *effect = l->data;
|
ClutterEffect *effect = l->data;
|
||||||
|
ClutterActorMeta *meta = l->data;
|
||||||
|
|
||||||
|
if (!clutter_actor_meta_get_enabled (meta))
|
||||||
|
continue;
|
||||||
|
|
||||||
priv->current_effect = l->data;
|
priv->current_effect = l->data;
|
||||||
|
|
||||||
@ -5687,7 +5695,10 @@ clutter_actor_allocate (ClutterActor *self,
|
|||||||
for (l = constraints; l != NULL; l = l->next)
|
for (l = constraints; l != NULL; l = l->next)
|
||||||
{
|
{
|
||||||
ClutterConstraint *constraint = l->data;
|
ClutterConstraint *constraint = l->data;
|
||||||
_clutter_constraint_update_allocation (constraint, self, &alloc);
|
ClutterActorMeta *meta = l->data;
|
||||||
|
|
||||||
|
if (clutter_actor_meta_get_enabled (meta))
|
||||||
|
_clutter_constraint_update_allocation (constraint, self, &alloc);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user