From 3190692601dea3f735ea4bccafd7b9b9ff4b1fae Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Wed, 20 Feb 2019 12:48:02 -0300 Subject: [PATCH] clutter/actor: Drop ClutterActor:clip property This is a deprecated property that is not used anywhere in the codebase. Not by GNOME Shell. Because it uses the deprecated ClutterGeometry type, it's a good target for cleaning up, given that ClutterGeometry will be dropped later on. https://gitlab.gnome.org/GNOME/mutter/merge_requests/458 --- clutter/clutter/clutter-actor.c | 40 --------------------------------- 1 file changed, 40 deletions(-) diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index fd38338c7..37700c75c 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -896,7 +896,6 @@ enum PROP_DEPTH, /* XXX:2.0 remove */ PROP_Z_POSITION, - PROP_CLIP, /* XXX:2.0 remove */ PROP_CLIP_RECT, PROP_HAS_CLIP, PROP_CLIP_TO_ALLOCATION, @@ -5034,7 +5033,6 @@ clutter_actor_set_clip_rect (ClutterActor *self, clutter_actor_queue_redraw (self); - g_object_notify_by_pspec (obj, obj_props[PROP_CLIP]); /* XXX:2.0 - remove */ g_object_notify_by_pspec (obj, obj_props[PROP_CLIP_RECT]); g_object_notify_by_pspec (obj, obj_props[PROP_HAS_CLIP]); } @@ -5222,16 +5220,6 @@ clutter_actor_set_property (GObject *object, clutter_actor_set_scale_gravity (actor, g_value_get_enum (value)); break; - case PROP_CLIP: /* XXX:2.0 - remove */ - { - const ClutterGeometry *geom = g_value_get_boxed (value); - - clutter_actor_set_clip (actor, - geom->x, geom->y, - geom->width, geom->height); - } - break; - case PROP_CLIP_RECT: clutter_actor_set_clip_rect (actor, g_value_get_boxed (value)); break; @@ -5570,19 +5558,6 @@ clutter_actor_get_property (GObject *object, g_value_set_boolean (value, priv->has_clip); break; - case PROP_CLIP: /* XXX:2.0 - remove */ - { - ClutterGeometry clip; - - clip.x = CLUTTER_NEARBYINT (priv->clip.origin.x); - clip.y = CLUTTER_NEARBYINT (priv->clip.origin.y); - clip.width = CLUTTER_NEARBYINT (priv->clip.size.width); - clip.height = CLUTTER_NEARBYINT (priv->clip.size.height); - - g_value_set_boxed (value, &clip); - } - break; - case PROP_CLIP_RECT: g_value_set_boxed (value, &priv->clip); break; @@ -6943,20 +6918,6 @@ clutter_actor_class_init (ClutterActorClass *klass) FALSE, CLUTTER_PARAM_READABLE); - /** - * ClutterActor:clip: - * - * The visible region of the actor, in actor-relative coordinates - * - * Deprecated: 1.12: Use #ClutterActor:clip-rect instead. - */ - obj_props[PROP_CLIP] = /* XXX:2.0 - remove */ - g_param_spec_boxed ("clip", - P_("Clip"), - P_("The clip region for the actor"), - CLUTTER_TYPE_GEOMETRY, - CLUTTER_PARAM_READWRITE); - /** * ClutterActor:clip-rect: * @@ -12475,7 +12436,6 @@ clutter_actor_set_clip (ClutterActor *self, clutter_actor_queue_redraw (self); - g_object_notify_by_pspec (obj, obj_props[PROP_CLIP]); g_object_notify_by_pspec (obj, obj_props[PROP_CLIP_RECT]); g_object_notify_by_pspec (obj, obj_props[PROP_HAS_CLIP]); }