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

actor: Deprecate scale center and gravity accessors

Browse Source 
The ClutterActor:pivot-point supercedes the scale center and gravity
properties.

https://bugzilla.gnome.org/show_bug.cgi?id=677853
This commit is contained in:
Emmanuele Bassi 2012-07-06 12:14:44 +01:00
parent 4be7ecb836
commit 005584a1ee
4 changed files with 50 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clutter/clutter-actor.c
View File

@ -6406,6 +6406,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
* The horizontal center point for scaling * The horizontal center point for scaling
* *
* Since: 1.0 * Since: 1.0
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/ */
obj_props[PROP_SCALE_CENTER_X] = obj_props[PROP_SCALE_CENTER_X] =
g_param_spec_float ("scale-center-x", g_param_spec_float ("scale-center-x",
@ -6413,7 +6415,9 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("Horizontal scale center"), P_("Horizontal scale center"),
-G_MAXFLOAT, G_MAXFLOAT, -G_MAXFLOAT, G_MAXFLOAT,
0.0, 0.0,
CLUTTER_PARAM_READWRITE); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
G_PARAM_DEPRECATED);
/** /**
* ClutterActor:scale-center-y: * ClutterActor:scale-center-y:
@ -6421,6 +6425,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
* The vertical center point for scaling * The vertical center point for scaling
* *
* Since: 1.0 * Since: 1.0
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/ */
obj_props[PROP_SCALE_CENTER_Y] = obj_props[PROP_SCALE_CENTER_Y] =
g_param_spec_float ("scale-center-y", g_param_spec_float ("scale-center-y",
@ -6428,7 +6434,9 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("Vertical scale center"), P_("Vertical scale center"),
-G_MAXFLOAT, G_MAXFLOAT, -G_MAXFLOAT, G_MAXFLOAT,
0.0, 0.0,
CLUTTER_PARAM_READWRITE); G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
G_PARAM_DEPRECATED);
/** /**
* ClutterActor:scale-gravity: * ClutterActor:scale-gravity:
@ -6436,6 +6444,8 @@ clutter_actor_class_init (ClutterActorClass *klass)
* The center point for scaling expressed as a #ClutterGravity * The center point for scaling expressed as a #ClutterGravity
* *
* Since: 1.0 * Since: 1.0
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/ */
obj_props[PROP_SCALE_GRAVITY] = obj_props[PROP_SCALE_GRAVITY] =
g_param_spec_enum ("scale-gravity", g_param_spec_enum ("scale-gravity",
@ -6443,7 +6453,9 @@ clutter_actor_class_init (ClutterActorClass *klass)
P_("The center of scaling"), P_("The center of scaling"),
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:rotation-angle-x: * ClutterActor:rotation-angle-x:
@ -10510,9 +10522,9 @@ clutter_actor_get_y (ClutterActor *self)
* @scale_x: double factor to scale actor by horizontally. * @scale_x: double factor to scale actor by horizontally.
* @scale_y: double factor to scale actor by vertically. * @scale_y: double factor to scale actor by vertically.
* *
* Scales an actor with the given factors. The scaling is relative to * Scales an actor with the given factors.
* the scale center and the anchor point. The scale center is *
* unchanged by this function and defaults to 0,0. * The scale transformation is relative the the #ClutterActor:pivot-point.
* *
* The #ClutterActor:scale-x and #ClutterActor:scale-y properties are * The #ClutterActor:scale-x and #ClutterActor:scale-y properties are
* animatable. * animatable.
@ -10539,8 +10551,8 @@ clutter_actor_set_scale (ClutterActor *self,
* @self: A #ClutterActor * @self: A #ClutterActor
* @scale_x: double factor to scale actor by horizontally. * @scale_x: double factor to scale actor by horizontally.
* @scale_y: double factor to scale actor by vertically. * @scale_y: double factor to scale actor by vertically.
* @center_x: X coordinate of the center of the scale. * @center_x: X coordinate of the center of the scaling
* @center_y: Y coordinate of the center of the scale * @center_y: Y coordinate of the center of the scaling
* *
* Scales an actor with the given factors around the given center * Scales an actor with the given factors around the given center
* point. The center point is specified in pixels relative to the * point. The center point is specified in pixels relative to the
@ -10550,6 +10562,9 @@ clutter_actor_set_scale (ClutterActor *self,
* are animatable. * are animatable.
* *
* Since: 1.0 * Since: 1.0
*
* Deprecated: 1.12: Use clutter_actor_set_pivot_point() to control
* the scale center
*/ */
void void
clutter_actor_set_scale_full (ClutterActor *self, clutter_actor_set_scale_full (ClutterActor *self,
@ -10588,6 +10603,9 @@ clutter_actor_set_scale_full (ClutterActor *self,
* animatable. * animatable.
* *
* Since: 1.0 * Since: 1.0
*
* Deprecated: 1.12: Use clutter_actor_set_pivot_point() to set the
* scale center using normalized coordinates instead.
*/ */
void void
clutter_actor_set_scale_with_gravity (ClutterActor *self, clutter_actor_set_scale_with_gravity (ClutterActor *self,
@ -10650,6 +10668,8 @@ clutter_actor_get_scale (ClutterActor *self,
* current size of the actor. * current size of the actor.
* *
* Since: 1.0 * Since: 1.0
*
* Deprecated: 1.12: Use clutter_actor_get_pivot_point() instead.
*/ */
void void
clutter_actor_get_scale_center (ClutterActor *self, clutter_actor_get_scale_center (ClutterActor *self,
@ -10679,6 +10699,8 @@ clutter_actor_get_scale_center (ClutterActor *self,
* Return value: the scale gravity * Return value: the scale gravity
* *
* Since: 1.0 * Since: 1.0
*
* Deprecated: 1.12: Use clutter_actor_get_pivot_point() instead.
*/ */
ClutterGravity ClutterGravity
clutter_actor_get_scale_gravity (ClutterActor *self) clutter_actor_get_scale_gravity (ClutterActor *self)

13
clutter/clutter-actor.h
View File

@ -643,22 +643,9 @@ gdouble clutter_actor_get_rotation_angle
void clutter_actor_set_scale (ClutterActor *self, void clutter_actor_set_scale (ClutterActor *self,
gdouble scale_x, gdouble scale_x,
gdouble scale_y); gdouble scale_y);
void clutter_actor_set_scale_full (ClutterActor *self,
gdouble scale_x,
gdouble scale_y,
gfloat center_x,
gfloat center_y);
void clutter_actor_set_scale_with_gravity (ClutterActor *self,
gdouble scale_x,
gdouble scale_y,
ClutterGravity gravity);
void clutter_actor_get_scale (ClutterActor *self, void clutter_actor_get_scale (ClutterActor *self,
gdouble *scale_x, gdouble *scale_x,
gdouble *scale_y); gdouble *scale_y);
void clutter_actor_get_scale_center (ClutterActor *self,
gfloat *center_x,
gfloat *center_y);
ClutterGravity clutter_actor_get_scale_gravity (ClutterActor *self);
void clutter_actor_set_anchor_point (ClutterActor *self, void clutter_actor_set_anchor_point (ClutterActor *self,
gfloat anchor_x, gfloat anchor_x,
gfloat anchor_y); gfloat anchor_y);

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

@ -110,6 +110,24 @@ gdouble clutter_actor_get_rotation (ClutterActor
CLUTTER_DEPRECATED_IN_1_12 CLUTTER_DEPRECATED_IN_1_12
ClutterGravity clutter_actor_get_z_rotation_gravity (ClutterActor *self); ClutterGravity clutter_actor_get_z_rotation_gravity (ClutterActor *self);
CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_set_scale and clutter_actor_set_pivot_point)
void clutter_actor_set_scale_full (ClutterActor *self,
gdouble scale_x,
gdouble scale_y,
gfloat center_x,
gfloat center_y);
CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_set_scale and clutter_actor_set_pivot_point)
void clutter_actor_set_scale_with_gravity (ClutterActor *self,
gdouble scale_x,
gdouble scale_y,
ClutterGravity gravity);
CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_get_pivot_point)
void clutter_actor_get_scale_center (ClutterActor *self,
gfloat *center_x,
gfloat *center_y);
CLUTTER_DEPRECATED_IN_1_12_FOR(clutter_actor_get_pivot_point)
ClutterGravity clutter_actor_get_scale_gravity (ClutterActor *self);
G_END_DECLS G_END_DECLS
#endif /* __CLUTTER_ACTOR_DEPRECATED_H__ */ #endif /* __CLUTTER_ACTOR_DEPRECATED_H__ */

1
clutter/deprecated/clutter-behaviour-scale.c
View File

@ -42,6 +42,7 @@
#include <math.h> #include <math.h>
#define CLUTTER_DISABLE_DEPRECATION_WARNINGS #define CLUTTER_DISABLE_DEPRECATION_WARNINGS
#include "deprecated/clutter-actor.h"
#include "clutter-alpha.h" #include "clutter-alpha.h"
#include "clutter-behaviour.h" #include "clutter-behaviour.h"