isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

animator: only keys that are removed due to actors disappearing are inert

Browse Source
This commit is contained in:
Øyvind Kolås 2010-05-05 16:55:16 +01:00
parent 0f8ca38e59
commit e4089efb4c
1 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
clutter/clutter-animator.c
View File

@ -354,12 +354,19 @@ sort_actor_prop_func (gconstpointer a,
return pa->object - pb->object;
}
static void
clutter_animator_remove_key_internal (ClutterAnimator *animator,
GObject *object,
const gchar *property_name,
gdouble progress,
gboolean is_inert);
static void
object_disappeared (gpointer data,
GObject *where_the_object_was)
{
clutter_animator_remove_key (data, where_the_object_was, NULL, -1.0);
clutter_animator_remove_key_internal (data, where_the_object_was, NULL, -1.0,
TRUE);
}
static ClutterAnimatorKey *
@ -1380,24 +1387,12 @@ clutter_animator_get_keys (ClutterAnimator *animator,
return g_list_reverse (keys);
}
/**
* clutter_animator_remove_key:
* @animator: a #ClutterAnimator
* @object: (allow-none): a #GObject to search for, or %NULL for all
* @property_name: (allow-none): a specific property name to query for,
* or %NULL for all
* @progress: a specific progress to search for or a negative value
* for all
*
* Removes all keys matching the conditions specificed in the arguments.
*
* Since: 1.2
*/
void
clutter_animator_remove_key (ClutterAnimator *animator,
static void
clutter_animator_remove_key_internal (ClutterAnimator *animator,
GObject *object,
const gchar *property_name,
gdouble progress)
gdouble progress,
gboolean is_inert)
{
ClutterAnimatorPrivate *priv;
GList *k;
@ -1419,7 +1414,7 @@ clutter_animator_remove_key (ClutterAnimator *animator,
)
{
ClutterAnimatorKey *prev_key = NULL;
key->is_inert = TRUE;
key->is_inert = is_inert;
clutter_animator_key_free (key);
@ -1465,6 +1460,29 @@ again:
}
}
/**
* clutter_animator_remove_key:
* @animator: a #ClutterAnimator
* @object: (allow-none): a #GObject to search for, or %NULL for all
* @property_name: (allow-none): a specific property name to query for,
* or %NULL for all
* @progress: a specific progress to search for or a negative value
* for all
*
* Removes all keys matching the conditions specificed in the arguments.
*
* Since: 1.2
*/
void
clutter_animator_remove_key (ClutterAnimator *animator,
GObject *object,
const gchar *property_name,
gdouble progress)
{
clutter_animator_remove_key_internal (animator, object, property_name,
progress, FALSE);
}