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

[clutter-clone] Override the parent opacity to self not self->parent

Browse Source 
The opacity of the source actor when painted from the clone should be
combined with the opacity of the clone as well as the clone's parents,
instead of just the parents.
This commit is contained in:
Neil Roberts 2009-02-04 00:14:16 +00:00
parent 8e44874a93
commit 8feb99722c
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clutter/clutter-clone.c
View File

@ -118,7 +118,6 @@ clutter_clone_paint (ClutterActor *self)
{ {
ClutterClone *clone = CLUTTER_CLONE (self); ClutterClone *clone = CLUTTER_CLONE (self);
ClutterClonePrivate *priv = clone->priv; ClutterClonePrivate *priv = clone->priv;
ClutterActor *parent;
ClutterGeometry geom, clone_geom; ClutterGeometry geom, clone_geom;
gfloat x_scale, y_scale; gfloat x_scale, y_scale;
@ -145,14 +144,13 @@ clutter_clone_paint (ClutterActor *self)
cogl_scale (x_scale, y_scale, 1.0); cogl_scale (x_scale, y_scale, 1.0);
/* The final bits of magic: /* The final bits of magic:
* - We need to make sure that when the clone-source actor's paint method * - We need to make sure that when the clone-source actor's paint
* calls clutter_actor_get_paint_opacity, it traverses our parent not it's * method calls clutter_actor_get_paint_opacity, it traverses to
* real parent. * us and our parent not it's real parent.
* - We need to stop clutter_actor_paint applying the model view matrix of * - We need to stop clutter_actor_paint applying the model view matrix of
* the clone source actor. * the clone source actor.
*/ */
parent = clutter_actor_get_parent (self); _clutter_actor_set_opacity_parent (priv->clone_source, self);
_clutter_actor_set_opacity_parent (priv->clone_source, parent);
_clutter_actor_set_enable_model_view_transform (priv->clone_source, FALSE); _clutter_actor_set_enable_model_view_transform (priv->clone_source, FALSE);
clutter_actor_paint (priv->clone_source); clutter_actor_paint (priv->clone_source);