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

actor: Deprecate anchor-point

Browse Source 
The pivot point and the translation transformation replace it
completely.

https://bugzilla.gnome.org/show_bug.cgi?id=677853
This commit is contained in:
Emmanuele Bassi 2012-07-06 18:06:48 +01:00
parent 20d1d24e38
commit 1796b37948
3 changed files with 78 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
clutter/clutter-actor.c
View File

@ -6847,9 +6847,20 @@ clutter_actor_class_init (ClutterActorClass *klass)
* ClutterActor:anchor-x: * ClutterActor:anchor-x:
* *
* The X coordinate of an actor's anchor point, relative to * The X coordinate of an actor's anchor point, relative to
* the actor coordinate space, in pixels * the actor coordinate space, in pixels.
*
* <warning>It is highly recommended not to use #ClutterActor:anchor-x,
* #ClutterActor:anchor-y, and #ClutterActor:anchor-gravity in newly
* written code; the anchor point adds an additional translation that
* will affect the actor's relative position with regards to its
* parent, as well as the position of its children. This change is
* needs to always be taken into account when positioning the actor.
* It is recommended to use the #ClutterActor:pivot-point property
* instead, as it will affect only the transformations.</warning>
* *
* Since: 0.8 * Since: 0.8
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/ */
obj_props[PROP_ANCHOR_X] = obj_props[PROP_ANCHOR_X] =
g_param_spec_float ("anchor-x", g_param_spec_float ("anchor-x",
@ -6857,7 +6868,9 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("X coordinate of the anchor point"), P_("X coordinate of the anchor point"),
-G_MAXFLOAT, G_MAXFLOAT, -G_MAXFLOAT, G_MAXFLOAT,
0, 0,
CLUTTER_PARAM_READWRITE); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
G_PARAM_DEPRECATED);
/** /**
* ClutterActor:anchor-y: * ClutterActor:anchor-y:
@ -6865,7 +6878,18 @@ clutter_actor_class_init (ClutterActorClass *klass)
* The Y coordinate of an actor's anchor point, relative to * The Y coordinate of an actor's anchor point, relative to
* the actor coordinate space, in pixels * the actor coordinate space, in pixels
* *
* <warning>It is highly recommended not to use #ClutterActor:anchor-x,
* #ClutterActor:anchor-y, and #ClutterActor:anchor-gravity in newly
* written code; the anchor point adds an additional translation that
* will affect the actor's relative position with regards to its
* parent, as well as the position of its children. This change is
* needs to always be taken into account when positioning the actor.
* It is recommended to use the #ClutterActor:pivot-point property
* instead, as it will affect only the transformations.</warning>
*
* Since: 0.8 * Since: 0.8
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/ */
obj_props[PROP_ANCHOR_Y] = obj_props[PROP_ANCHOR_Y] =
g_param_spec_float ("anchor-y", g_param_spec_float ("anchor-y",
@ -6873,14 +6897,27 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("Y coordinate of the anchor point"), P_("Y coordinate of the anchor point"),
-G_MAXFLOAT, G_MAXFLOAT, -G_MAXFLOAT, G_MAXFLOAT,
0, 0,
CLUTTER_PARAM_READWRITE); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
G_PARAM_DEPRECATED);
/** /**
* ClutterActor:anchor-gravity: * ClutterActor:anchor-gravity:
* *
* The anchor point expressed as a #ClutterGravity * The anchor point expressed as a #ClutterGravity
* *
* <warning>It is highly recommended not to use #ClutterActor:anchor-x,
* #ClutterActor:anchor-y, and #ClutterActor:anchor-gravity in newly
* written code; the anchor point adds an additional translation that
* will affect the actor's relative position with regards to its
* parent, as well as the position of its children. This change is
* needs to always be taken into account when positioning the actor.
* It is recommended to use the #ClutterActor:pivot-point property
* instead, as it will affect only the transformations.</warning>
*
* Since: 1.0 * Since: 1.0
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/ */
obj_props[PROP_ANCHOR_GRAVITY] = obj_props[PROP_ANCHOR_GRAVITY] =
g_param_spec_enum ("anchor-gravity", g_param_spec_enum ("anchor-gravity",
@ -6888,7 +6925,9 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("The anchor point as a ClutterGravity"), P_("The anchor point as a ClutterGravity"),
CLUTTER_TYPE_GRAVITY, CLUTTER_TYPE_GRAVITY,
CLUTTER_GRAVITY_NONE, CLUTTER_GRAVITY_NONE,
CLUTTER_PARAM_READWRITE); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
G_PARAM_DEPRECATED);
/** /**
* ClutterActor:translation-x: * ClutterActor:translation-x:
@ -9761,7 +9800,8 @@ clutter_actor_set_fixed_position_set (ClutterActor *self,
* *
* This function modifies the fixed position of an actor and thus removes * This function modifies the fixed position of an actor and thus removes
* it from any layout management. Another way to move an actor is with an * it from any layout management. Another way to move an actor is with an
* anchor point, see clutter_actor_set_anchor_point(). * anchor point, see clutter_actor_set_anchor_point(), or with an additional
* translation, using clutter_actor_set_translation().
* *
* Since: 0.2 * Since: 0.2
*/ */
@ -13387,6 +13427,8 @@ clutter_actor_get_reactive (ClutterActor *actor)
* Gets the current anchor point of the @actor in pixels. * Gets the current anchor point of the @actor in pixels.
* *
* Since: 0.6 * Since: 0.6
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/ */
void void
clutter_actor_get_anchor_point (ClutterActor *self, clutter_actor_get_anchor_point (ClutterActor *self,
@ -13416,6 +13458,8 @@ clutter_actor_get_anchor_point (ClutterActor *self,
* of the actor. * of the actor.
* *
* Since: 0.6 * Since: 0.6
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead.
*/ */
void void
clutter_actor_set_anchor_point (ClutterActor *self, clutter_actor_set_anchor_point (ClutterActor *self,
@ -13478,6 +13522,8 @@ clutter_actor_set_anchor_point (ClutterActor *self,
* Return value: the #ClutterGravity used by the anchor point * Return value: the #ClutterGravity used by the anchor point
* *
* Since: 1.0 * Since: 1.0
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead.
*/ */
ClutterGravity ClutterGravity
clutter_actor_get_anchor_point_gravity (ClutterActor *self) clutter_actor_get_anchor_point_gravity (ClutterActor *self)
@ -13501,6 +13547,8 @@ clutter_actor_get_anchor_point_gravity (ClutterActor *self)
* the relative position of the actor toward its parent remains the same. * the relative position of the actor toward its parent remains the same.
* *
* Since: 0.6 * Since: 0.6
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead.
*/ */
void void
clutter_actor_move_anchor_point (ClutterActor *self, clutter_actor_move_anchor_point (ClutterActor *self,
@ -13546,6 +13594,8 @@ clutter_actor_move_anchor_point (ClutterActor *self,
* to the bottom right. * to the bottom right.
* *
* Since: 0.6 * Since: 0.6
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead.
*/ */
void void
clutter_actor_move_anchor_point_from_gravity (ClutterActor *self, clutter_actor_move_anchor_point_from_gravity (ClutterActor *self,
@ -13595,6 +13645,8 @@ clutter_actor_move_anchor_point_from_gravity (ClutterActor *self,
* to the bottom right. * to the bottom right.
* *
* Since: 0.6 * Since: 0.6
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead.
*/ */
void void
clutter_actor_set_anchor_point_from_gravity (ClutterActor *self, clutter_actor_set_anchor_point_from_gravity (ClutterActor *self,

14
clutter/clutter-actor.h
View File

@ -661,20 +661,6 @@ void clutter_actor_get_translation
gfloat *translate_x, gfloat *translate_x,
gfloat *translate_y, gfloat *translate_y,
gfloat *translate_z); gfloat *translate_z);
void clutter_actor_set_anchor_point (ClutterActor *self,
gfloat anchor_x,
gfloat anchor_y);
void clutter_actor_move_anchor_point (ClutterActor *self,
gfloat anchor_x,
gfloat anchor_y);
void clutter_actor_get_anchor_point (ClutterActor *self,
gfloat *anchor_x,
gfloat *anchor_y);
ClutterGravity clutter_actor_get_anchor_point_gravity (ClutterActor *self);
void clutter_actor_set_anchor_point_from_gravity (ClutterActor *self,
ClutterGravity gravity);
void clutter_actor_move_anchor_point_from_gravity (ClutterActor *self,
ClutterGravity gravity);
void clutter_actor_get_transformed_position (ClutterActor *self, void clutter_actor_get_transformed_position (ClutterActor *self,
gfloat *x, gfloat *x,
gfloat *y); gfloat *y);

21
clutter/deprecated/clutter-actor.h
View File

@ -128,6 +128,27 @@ void clutter_actor_get_scale_center (ClutterActor
CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_get_pivot_point) CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_get_pivot_point)
ClutterGravity clutter_actor_get_scale_gravity (ClutterActor *self); ClutterGravity clutter_actor_get_scale_gravity (ClutterActor *self);
CLUTTER_DEPRECATED_IN_1_12
void clutter_actor_set_anchor_point (ClutterActor *self,
gfloat anchor_x,
gfloat anchor_y);
CLUTTER_DEPRECATED_IN_1_12
void clutter_actor_move_anchor_point (ClutterActor *self,
gfloat anchor_x,
gfloat anchor_y);
CLUTTER_DEPRECATED_IN_1_12
void clutter_actor_get_anchor_point (ClutterActor *self,
gfloat *anchor_x,
gfloat *anchor_y);
CLUTTER_DEPRECATED_IN_1_12
ClutterGravity clutter_actor_get_anchor_point_gravity (ClutterActor *self);
CLUTTER_DEPRECATED_IN_1_12
void clutter_actor_set_anchor_point_from_gravity (ClutterActor *self,
ClutterGravity gravity);
CLUTTER_DEPRECATED_IN_1_12
void clutter_actor_move_anchor_point_from_gravity (ClutterActor *self,
ClutterGravity gravity);
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_ACTOR_DEPRECATED_H__ */ #endif /* __CLUTTER_ACTOR_DEPRECATED_H__ */