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

* clutter/clutter-actor.c:

Browse Source 
(_clutter_actor_apply_modelview_transform): perform translation as
well as anchor point adjustment based on self not being stage (and
not by self not being an orphan).
This commit is contained in:
Øyvind Kolås 2008-02-07 13:05:18 +00:00
parent a3c79e567c
commit 56a34b724f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2008-02-07 Øyvind Kolås <pippin@o-hand.com>
* clutter/clutter-actor.c:
(_clutter_actor_apply_modelview_transform): perform translation as
well as anchor point adjustment based on self not being stage (and
not by self not being an orphan).
2008-02-07 Matthew Allum <mallum@openedhand.com> 2008-02-07 Matthew Allum <mallum@openedhand.com>
* clutter/clutter-stage.c: * clutter/clutter-stage.c:

8
clutter/clutter-actor.c
View File

@ -824,11 +824,9 @@ static void
_clutter_actor_apply_modelview_transform (ClutterActor * self) _clutter_actor_apply_modelview_transform (ClutterActor * self)
{ {
ClutterActorPrivate *priv = self->priv; ClutterActorPrivate *priv = self->priv;
ClutterActor *parent; gboolean is_stage = CLUTTER_IS_STAGE (self);
parent = clutter_actor_get_parent (self); if (!is_stage)
if (parent != NULL)
{ {
cogl_translatex (CLUTTER_UNITS_TO_FIXED (priv->coords.x1), cogl_translatex (CLUTTER_UNITS_TO_FIXED (priv->coords.x1),
CLUTTER_UNITS_TO_FIXED (priv->coords.y1), CLUTTER_UNITS_TO_FIXED (priv->coords.y1),
@ -886,7 +884,7 @@ _clutter_actor_apply_modelview_transform (ClutterActor * self)
CLUTTER_UNITS_TO_FIXED (-(priv->z + priv->rxz))); CLUTTER_UNITS_TO_FIXED (-(priv->z + priv->rxz)));
} }
if (parent && (priv->anchor_x || priv->anchor_y)) if (!is_stage && (priv->anchor_x || priv->anchor_y))
{ {
cogl_translatex (CLUTTER_UNITS_TO_FIXED (-priv->anchor_x), cogl_translatex (CLUTTER_UNITS_TO_FIXED (-priv->anchor_x),
CLUTTER_UNITS_TO_FIXED (-priv->anchor_y), CLUTTER_UNITS_TO_FIXED (-priv->anchor_y),