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

clutter/actor: Remove scale center and gravity

Browse Source 
They're deprecated and, as of now, unused.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1332
This commit is contained in:
Georges Basile Stavracas Neto 2020-06-26 18:49:10 -03:00 committed by Robert Mader
parent 031098a43d
commit dbce29a0ae
3 changed files with 2 additions and 302 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter/clutter-actor-private.h
View File

@ -192,7 +192,6 @@ struct _ClutterTransformInfo
gdouble scale_x; gdouble scale_x;
gdouble scale_y; gdouble scale_y;
gdouble scale_z; gdouble scale_z;
AnchorCoord scale_center;
/* anchor point */ /* anchor point */
AnchorCoord anchor; AnchorCoord anchor;

290
clutter/clutter/clutter-actor.c
View File

@ -926,9 +926,6 @@ enum
PROP_SCALE_X, PROP_SCALE_X,
PROP_SCALE_Y, PROP_SCALE_Y,
PROP_SCALE_Z, PROP_SCALE_Z,
PROP_SCALE_CENTER_X, /* XXX:2.0 remove */
PROP_SCALE_CENTER_Y, /* XXX:2.0 remove */
PROP_SCALE_GRAVITY, /* XXX:2.0 remove */
PROP_RESOURCE_SCALE, PROP_RESOURCE_SCALE,
PROP_ROTATION_ANGLE_X, /* XXX:2.0 rename to rotation-x */ PROP_ROTATION_ANGLE_X, /* XXX:2.0 rename to rotation-x */
@ -1109,15 +1106,6 @@ static void clutter_actor_push_in_cloned_branch (ClutterActor *self,
static void clutter_actor_pop_in_cloned_branch (ClutterActor *self, static void clutter_actor_pop_in_cloned_branch (ClutterActor *self,
gulong count); gulong count);
/* Helper macro which translates by the anchor coord, applies the
given transformation and then translates back */
#define TRANSFORM_ABOUT_ANCHOR_COORD(a,m,c,_transform) G_STMT_START { \
gfloat _tx, _ty, _tz; \
clutter_anchor_coord_get_units ((a), (c), &_tx, &_ty, &_tz); \
cogl_matrix_translate ((m), _tx, _ty, _tz); \
{ _transform; } \
cogl_matrix_translate ((m), -_tx, -_ty, -_tz); } G_STMT_END
static GQuark quark_actor_layout_info = 0; static GQuark quark_actor_layout_info = 0;
static GQuark quark_actor_transform_info = 0; static GQuark quark_actor_transform_info = 0;
static GQuark quark_actor_animation_info = 0; static GQuark quark_actor_animation_info = 0;
@ -3149,15 +3137,7 @@ clutter_actor_real_apply_transform (ClutterActor *self,
* code we use when interpolating transformations * code we use when interpolating transformations
*/ */
if (info->scale_x != 1.0 || info->scale_y != 1.0 || info->scale_z != 1.0) if (info->scale_x != 1.0 || info->scale_y != 1.0 || info->scale_z != 1.0)
{ cogl_matrix_scale (transform, info->scale_x, info->scale_y, info->scale_z);
/* XXX:2.0 remove anchor coord */
TRANSFORM_ABOUT_ANCHOR_COORD (self, transform,
&info->scale_center,
cogl_matrix_scale (transform,
info->scale_x,
info->scale_y,
info->scale_z));
}
if (info->rz_angle) if (info->rz_angle)
cogl_matrix_rotate (transform, info->rz_angle, 0, 0, 1.0); cogl_matrix_rotate (transform, info->rz_angle, 0, 0, 1.0);
@ -4429,7 +4409,7 @@ static const ClutterTransformInfo default_transform_info = {
0.0, /* rotation-y */ 0.0, /* rotation-y */
0.0, /* rotation-z */ 0.0, /* rotation-z */
1.0, 1.0, 1.0, { 0, }, /* scale */ 1.0, 1.0, 1.0, /* scale */
{ 0, }, /* anchor XXX:2.0 - remove*/ { 0, }, /* anchor XXX:2.0 - remove*/
@ -4872,78 +4852,6 @@ clutter_actor_set_scale_factor (ClutterActor *self,
_clutter_actor_create_transition (self, pspec, *scale_p, factor); _clutter_actor_create_transition (self, pspec, *scale_p, factor);
} }
static inline void
clutter_actor_set_scale_center (ClutterActor *self,
ClutterRotateAxis axis,
gfloat coord)
{
GObject *obj = G_OBJECT (self);
ClutterTransformInfo *info;
gfloat center_x, center_y;
info = _clutter_actor_get_transform_info (self);
g_object_freeze_notify (obj);
/* get the current scale center coordinates */
clutter_anchor_coord_get_units (self, &info->scale_center,
&center_x,
&center_y,
NULL);
/* we need to notify this too, because setting explicit coordinates will
* change the gravity as a side effect
*/
if (info->scale_center.is_fractional)
g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_GRAVITY]);
switch (axis)
{
case CLUTTER_X_AXIS:
clutter_anchor_coord_set_units (&info->scale_center, coord, center_y, 0);
g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_CENTER_X]);
break;
case CLUTTER_Y_AXIS:
clutter_anchor_coord_set_units (&info->scale_center, center_x, coord, 0);
g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_CENTER_Y]);
break;
default:
g_assert_not_reached ();
}
self->priv->transform_valid = FALSE;
clutter_actor_queue_redraw (self);
g_object_thaw_notify (obj);
}
static inline void
clutter_actor_set_scale_gravity (ClutterActor *self,
ClutterGravity gravity)
{
ClutterTransformInfo *info;
GObject *obj;
info = _clutter_actor_get_transform_info (self);
obj = G_OBJECT (self);
if (gravity == CLUTTER_GRAVITY_NONE)
clutter_anchor_coord_set_units (&info->scale_center, 0, 0, 0);
else
clutter_anchor_coord_set_gravity (&info->scale_center, gravity);
self->priv->transform_valid = FALSE;
g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_CENTER_X]);
g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_CENTER_Y]);
g_object_notify_by_pspec (obj, obj_props[PROP_SCALE_GRAVITY]);
clutter_actor_queue_redraw (self);
}
/* XXX:2.0 - remove */ /* XXX:2.0 - remove */
static inline void static inline void
clutter_actor_set_anchor_coord (ClutterActor *self, clutter_actor_set_anchor_coord (ClutterActor *self,
@ -5181,20 +5089,6 @@ clutter_actor_set_property (GObject *object,
g_value_get_double (value)); g_value_get_double (value));
break; break;
case PROP_SCALE_CENTER_X: /* XXX:2.0 - remove */
clutter_actor_set_scale_center (actor, CLUTTER_X_AXIS,
g_value_get_float (value));
break;
case PROP_SCALE_CENTER_Y: /* XXX:2.0 - remove */
clutter_actor_set_scale_center (actor, CLUTTER_Y_AXIS,
g_value_get_float (value));
break;
case PROP_SCALE_GRAVITY: /* XXX:2.0 - remove */
clutter_actor_set_scale_gravity (actor, g_value_get_enum (value));
break;
case PROP_CLIP_RECT: case PROP_CLIP_RECT:
clutter_actor_set_clip_rect (actor, g_value_get_boxed (value)); clutter_actor_set_clip_rect (actor, g_value_get_boxed (value));
break; break;
@ -5581,30 +5475,6 @@ clutter_actor_get_property (GObject *object,
} }
break; break;
case PROP_SCALE_CENTER_X: /* XXX:2.0 - remove */
{
gfloat center;
clutter_actor_get_scale_center (actor, &center, NULL);
g_value_set_float (value, center);
}
break;
case PROP_SCALE_CENTER_Y: /* XXX:2.0 - remove */
{
gfloat center;
clutter_actor_get_scale_center (actor, NULL, &center);
g_value_set_float (value, center);
}
break;
case PROP_SCALE_GRAVITY: /* XXX:2.0 - remove */
g_value_set_enum (value, clutter_actor_get_scale_gravity (actor));
break;
case PROP_RESOURCE_SCALE: case PROP_RESOURCE_SCALE:
if (priv->needs_compute_resource_scale) if (priv->needs_compute_resource_scale)
{ {
@ -6940,63 +6810,6 @@ clutter_actor_class_init (ClutterActorClass *klass)
G_PARAM_STATIC_STRINGS | G_PARAM_STATIC_STRINGS |
CLUTTER_PARAM_ANIMATABLE); CLUTTER_PARAM_ANIMATABLE);
/**
* ClutterActor:scale-center-x:
*
* The horizontal center point for scaling
*
* Since: 1.0
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/
obj_props[PROP_SCALE_CENTER_X] = /* XXX:2.0 - remove */
g_param_spec_float ("scale-center-x",
P_("Scale Center X"),
P_("Horizontal scale center"),
-G_MAXFLOAT, G_MAXFLOAT,
0.0,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
G_PARAM_DEPRECATED);
/**
* ClutterActor:scale-center-y:
*
* The vertical center point for scaling
*
* Since: 1.0
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/
obj_props[PROP_SCALE_CENTER_Y] = /* XXX:2.0 - remove */
g_param_spec_float ("scale-center-y",
P_("Scale Center Y"),
P_("Vertical scale center"),
-G_MAXFLOAT, G_MAXFLOAT,
0.0,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
G_PARAM_DEPRECATED);
/**
* ClutterActor:scale-gravity:
*
* The center point for scaling expressed as a #ClutterGravity
*
* Since: 1.0
*
* Deprecated: 1.12: Use #ClutterActor:pivot-point instead
*/
obj_props[PROP_SCALE_GRAVITY] = /* XXX:2.0 - remove */
g_param_spec_enum ("scale-gravity",
P_("Scale Gravity"),
P_("The center of scaling"),
CLUTTER_TYPE_GRAVITY,
CLUTTER_GRAVITY_NONE,
G_PARAM_READWRITE |
G_PARAM_STATIC_STRINGS |
G_PARAM_DEPRECATED);
/** /**
* ClutterActor:resource-scale: * ClutterActor:resource-scale:
* *
@ -11251,45 +11064,6 @@ clutter_actor_set_scale_z (ClutterActor *self,
clutter_actor_set_scale_factor (self, CLUTTER_Z_AXIS, scale_z); clutter_actor_set_scale_factor (self, CLUTTER_Z_AXIS, scale_z);
} }
/**
* clutter_actor_set_scale_full:
* @self: A #ClutterActor
* @scale_x: double factor to scale actor by horizontally.
* @scale_y: double factor to scale actor by vertically.
* @center_x: X coordinate of the center of the scaling
* @center_y: Y coordinate of the center of the scaling
*
* Scales an actor with the given factors around the given center
* point. The center point is specified in pixels relative to the
* anchor point (usually the top left corner of the actor).
*
* The #ClutterActor:scale-x and #ClutterActor:scale-y properties
* are animatable.
*
* Since: 1.0
*
* Deprecated: 1.12: Use clutter_actor_set_pivot_point() to control
* the scale center
*/
void
clutter_actor_set_scale_full (ClutterActor *self,
gdouble scale_x,
gdouble scale_y,
gfloat center_x,
gfloat center_y)
{
g_return_if_fail (CLUTTER_IS_ACTOR (self));
g_object_freeze_notify (G_OBJECT (self));
clutter_actor_set_scale_factor (self, CLUTTER_X_AXIS, scale_x);
clutter_actor_set_scale_factor (self, CLUTTER_Y_AXIS, scale_y);
clutter_actor_set_scale_center (self, CLUTTER_X_AXIS, center_x);
clutter_actor_set_scale_center (self, CLUTTER_Y_AXIS, center_y);
g_object_thaw_notify (G_OBJECT (self));
}
/** /**
* clutter_actor_get_scale: * clutter_actor_get_scale:
* @self: A #ClutterActor * @self: A #ClutterActor
@ -11339,66 +11113,6 @@ clutter_actor_get_scale_z (ClutterActor *self)
return _clutter_actor_get_transform_info_or_defaults (self)->scale_z; return _clutter_actor_get_transform_info_or_defaults (self)->scale_z;
} }
/**
* clutter_actor_get_scale_center:
* @self: A #ClutterActor
* @center_x: (out) (allow-none): Location to store the X position
* of the scale center, or %NULL.
* @center_y: (out) (allow-none): Location to store the Y position
* of the scale center, or %NULL.
*
* Retrieves the scale center coordinate in pixels relative to the top
* left corner of the actor. If the scale center was specified using a
* #ClutterGravity this will calculate the pixel offset using the
* current size of the actor.
*
* Since: 1.0
*
* Deprecated: 1.12: Use clutter_actor_get_pivot_point() instead.
*/
void
clutter_actor_get_scale_center (ClutterActor *self,
gfloat *center_x,
gfloat *center_y)
{
const ClutterTransformInfo *info;
g_return_if_fail (CLUTTER_IS_ACTOR (self));
info = _clutter_actor_get_transform_info_or_defaults (self);
clutter_anchor_coord_get_units (self, &info->scale_center,
center_x,
center_y,
NULL);
}
/**
* clutter_actor_get_scale_gravity:
* @self: A #ClutterActor
*
* Retrieves the scale center as a compass direction. If the scale
* center was specified in pixels or units this will return
* %CLUTTER_GRAVITY_NONE.
*
* Return value: the scale gravity
*
* Since: 1.0
*
* Deprecated: 1.12: Use clutter_actor_get_pivot_point() instead.
*/
ClutterGravity
clutter_actor_get_scale_gravity (ClutterActor *self)
{
const ClutterTransformInfo *info;
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), CLUTTER_GRAVITY_NONE);
info = _clutter_actor_get_transform_info_or_defaults (self);
return clutter_anchor_coord_get_gravity (&info->scale_center);
}
static inline void static inline void
clutter_actor_set_opacity_internal (ClutterActor *self, clutter_actor_set_opacity_internal (ClutterActor *self,
guint8 opacity) guint8 opacity)

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

@ -33,19 +33,6 @@
G_BEGIN_DECLS G_BEGIN_DECLS
CLUTTER_DEPRECATED_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_FOR(clutter_actor_get_pivot_point)
void clutter_actor_get_scale_center (ClutterActor *self,
gfloat *center_x,
gfloat *center_y);
CLUTTER_DEPRECATED_FOR(clutter_actor_get_pivot_point)
ClutterGravity clutter_actor_get_scale_gravity (ClutterActor *self);
CLUTTER_DEPRECATED CLUTTER_DEPRECATED
void clutter_actor_set_anchor_point (ClutterActor *self, void clutter_actor_set_anchor_point (ClutterActor *self,
gfloat anchor_x, gfloat anchor_x,