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

2008-11-13 Emmanuele Bassi <ebassi@linux.intel.com>

Browse Source 
* clutter/clutter-behaviour-ellipse.c:
	(clutter_behaviour_ellipse_applied): Do not reset the depth
	of the actors to which the Ellipse behaviour has been applied
	to, unless the behaviour is going to update it because it has
	a tilt on the X or Y axis.
This commit is contained in:
Emmanuele Bassi 2008-11-13 10:54:06 +00:00
parent eb9799098b
commit bb6751b84b
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-11-13 Emmanuele Bassi <ebassi@linux.intel.com>
* clutter/clutter-behaviour-ellipse.c:
(clutter_behaviour_ellipse_applied): Do not reset the depth
of the actors to which the Ellipse behaviour has been applied
to, unless the behaviour is going to update it because it has
a tilt on the X or Y axis.
2008-11-13 Neil Roberts <neil@linux.intel.com> 2008-11-13 Neil Roberts <neil@linux.intel.com>
* clutter/clutter-actor.c (clutter_actor_get_reactive) * clutter/clutter-actor.c (clutter_actor_get_reactive)

21
clutter/clutter-behaviour-ellipse.c
View File

@ -32,8 +32,9 @@
* #ClutterBehaviourEllipse interpolates actors along a path defined by * #ClutterBehaviourEllipse interpolates actors along a path defined by
* an ellipse. * an ellipse.
* *
* Note, on applying an ellipse behaviour to an actor its position will * <note><para>When applying an ellipse behaviour to an actor, the
* be set to what is dictated by the ellipses initial position. * behaviour will update the actor's position and depth and set them
* to what is dictated by the ellipses initial position.</para></note>
* *
* Since: 0.4 * Since: 0.4
*/ */
@ -339,20 +340,18 @@ clutter_behaviour_ellipse_applied (ClutterBehaviour *behave,
ClutterActor *actor) ClutterActor *actor)
{ {
ClutterBehaviourEllipse *e = CLUTTER_BEHAVIOUR_ELLIPSE (behave); ClutterBehaviourEllipse *e = CLUTTER_BEHAVIOUR_ELLIPSE (behave);
knot3d knot; ClutterBehaviourEllipsePrivate *priv = e->priv;;
knot3d knot = { 0, };
clutter_behaviour_ellipse_advance (e, e->priv->angle_start, &knot); clutter_behaviour_ellipse_advance (e, priv->angle_start, &knot);
clutter_actor_set_position (actor, knot.x, knot.y); clutter_actor_set_position (actor, knot.x, knot.y);
clutter_actor_set_depth (actor, knot.z);
#if 0 /* the depth should be changed only if there is a tilt on
/* no need to chain up: ClutterBehaviourEllipse's parent class does * any of the X or the Y axis
* not have a class closure for ::apply
*/ */
if (CLUTTER_BEHAVIOUR_CLASS (clutter_behaviour_ellipse_parent_class)->apply) if (priv->angle_tilt_x != 0 || priv->angle_tilt_y != 0)
CLUTTER_BEHAVIOUR_CLASS (clutter_behaviour_ellipse_parent_class)->apply (behave, actor); clutter_actor_set_depth (actor, knot.z);
#endif
} }
static void static void