From 56a34b724f72fb443537002aaad418f199544da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Thu, 7 Feb 2008 13:05:18 +0000 Subject: [PATCH] * 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). --- ChangeLog | 7 +++++++ clutter/clutter-actor.c | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 18e99c785..d78a94615 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-02-07 Øyvind Kolås + + * 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 * clutter/clutter-stage.c: diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index 60bc6f0f5..9fe7562e0 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.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),