mirror of
https://github.com/brl/mutter.git
synced 2024-12-23 03:22:04 +00:00
* 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).
This commit is contained in:
parent
a3c79e567c
commit
56a34b724f
@ -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>
|
||||
|
||||
* clutter/clutter-stage.c:
|
||||
|
@ -824,11 +824,9 @@ static void
|
||||
_clutter_actor_apply_modelview_transform (ClutterActor * self)
|
||||
{
|
||||
ClutterActorPrivate *priv = self->priv;
|
||||
ClutterActor *parent;
|
||||
gboolean is_stage = CLUTTER_IS_STAGE (self);
|
||||
|
||||
parent = clutter_actor_get_parent (self);
|
||||
|
||||
if (parent != NULL)
|
||||
if (!is_stage)
|
||||
{
|
||||
cogl_translatex (CLUTTER_UNITS_TO_FIXED (priv->coords.x1),
|
||||
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)));
|
||||
}
|
||||
|
||||
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),
|
||||
CLUTTER_UNITS_TO_FIXED (-priv->anchor_y),
|
||||
|
Loading…
Reference in New Issue
Block a user