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

actor: Do not call get_opacity() from get_paint_opacity()

Browse Source 
We already have access to the opacity private field, there's no need to
go through the public API.
This commit is contained in:
Emmanuele Bassi 2010-02-12 16:18:12 +00:00
parent 124f30ccce
commit 37d51cb78e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clutter/clutter-actor.c
View File

@ -6287,13 +6287,13 @@ clutter_actor_get_paint_opacity (ClutterActor *self)
priv = self->priv; priv = self->priv;
if (priv->opacity_parent) if (priv->opacity_parent != NULL)
return clutter_actor_get_paint_opacity (priv->opacity_parent); return clutter_actor_get_paint_opacity (priv->opacity_parent);
parent = priv->parent_actor; parent = priv->parent_actor;
/* Factor in the actual actors opacity with parents */ /* Factor in the actual actors opacity with parents */
if (G_LIKELY (parent)) if (G_LIKELY (parent != NULL))
{ {
guint8 opacity = clutter_actor_get_paint_opacity (parent); guint8 opacity = clutter_actor_get_paint_opacity (parent);
@ -6301,7 +6301,7 @@ clutter_actor_get_paint_opacity (ClutterActor *self)
return (opacity * priv->opacity) / 0xff; return (opacity * priv->opacity) / 0xff;
} }
return clutter_actor_get_opacity (self); return priv->opacity;
} }
/** /**