From 819d62cde208954d90c2179b9fc38638c60e18d9 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 10 Nov 2023 00:33:37 +0100 Subject: [PATCH] clutter: Centralize repick handling due to transform changes Since we just queue up repicks, we can improve the mechanism added at commit 4d76a21029 this so it's less ad-hoc. Part-of: --- clutter/clutter/clutter-actor.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c index 3c43c5ec7..323a44e81 100644 --- a/clutter/clutter/clutter-actor.c +++ b/clutter/clutter/clutter-actor.c @@ -2397,11 +2397,7 @@ transform_changed (ClutterActor *actor) absolute_geometry_changed_cb, NULL, NULL); -} -static void -update_pointer_if_not_animated (ClutterActor *actor) -{ if (!clutter_actor_has_transitions (actor) && !CLUTTER_ACTOR_IN_RELAYOUT (actor)) clutter_actor_update_devices (actor); @@ -4264,7 +4260,6 @@ clutter_actor_set_pivot_point_internal (ClutterActor *self, info->pivot = *pivot; transform_changed (self); - update_pointer_if_not_animated (self); g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_PIVOT_POINT]); @@ -4281,7 +4276,6 @@ clutter_actor_set_pivot_point_z_internal (ClutterActor *self, info->pivot_z = pivot_z; transform_changed (self); - update_pointer_if_not_animated (self); g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_PIVOT_POINT_Z]); @@ -4316,7 +4310,6 @@ clutter_actor_set_translation_internal (ClutterActor *self, g_assert_not_reached (); transform_changed (self); - update_pointer_if_not_animated (self); clutter_actor_queue_redraw (self); g_object_notify_by_pspec (obj, pspec); @@ -4446,7 +4439,6 @@ clutter_actor_set_rotation_angle_internal (ClutterActor *self, g_assert_not_reached (); transform_changed (self); - update_pointer_if_not_animated (self); clutter_actor_queue_redraw (self); @@ -4568,7 +4560,6 @@ clutter_actor_set_scale_factor_internal (ClutterActor *self, g_assert_not_reached (); transform_changed (self); - update_pointer_if_not_animated (self); clutter_actor_queue_redraw (self); g_object_notify_by_pspec (obj, pspec); @@ -10402,7 +10393,6 @@ clutter_actor_set_z_position_internal (ClutterActor *self, info->z_position = z_position; transform_changed (self); - update_pointer_if_not_animated (self); clutter_actor_queue_redraw (self); @@ -13351,7 +13341,6 @@ clutter_actor_set_transform_internal (ClutterActor *self, info->transform_set = !graphene_matrix_is_identity (&info->transform); transform_changed (self); - update_pointer_if_not_animated (self); clutter_actor_queue_redraw (self); @@ -18492,7 +18481,6 @@ clutter_actor_invalidate_transform (ClutterActor *self) g_return_if_fail (CLUTTER_IS_ACTOR (self)); transform_changed (self); - update_pointer_if_not_animated (self); } /** @@ -18624,8 +18612,5 @@ clutter_actor_notify_transform_invalid (ClutterActor *self) g_assert (priv->transform_valid); if (!graphene_matrix_equal (&old_transform, &priv->transform)) - { - update_pointer_if_not_animated (self); - clutter_actor_queue_redraw (self); - } + clutter_actor_queue_redraw (self); }