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

state: fix clutter_state_change (state, "state-name", FALSE)

Browse Source 
Properties were not being updated correctly.
This commit is contained in:
Øyvind Kolås 2010-05-24 16:10:00 +01:00
parent 380e7b8b5d
commit 49a4c62319
1 changed files with 45 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
clutter/clutter-state.c
View File

@ -451,6 +451,7 @@ clutter_state_change (ClutterState *state,
ClutterStatePrivate *priv; ClutterStatePrivate *priv;
ClutterAnimator *animator; ClutterAnimator *animator;
State *new_state; State *new_state;
guint duration;
GList *k; GList *k;
g_return_val_if_fail (CLUTTER_IS_STATE (state), NULL); g_return_val_if_fail (CLUTTER_IS_STATE (state), NULL);
@ -483,17 +484,10 @@ clutter_state_change (ClutterState *state,
g_object_notify (G_OBJECT (state), "target-state"); g_object_notify (G_OBJECT (state), "target-state");
if (animate)
{
guint duration;
duration = clutter_state_get_duration (state, duration = clutter_state_get_duration (state,
priv->source_state_name, priv->source_state_name,
priv->target_state_name); priv->target_state_name);
clutter_timeline_set_duration (priv->timeline, duration); clutter_timeline_set_duration (priv->timeline, duration);
}
else
clutter_timeline_set_duration (priv->timeline, 1);
new_state = g_hash_table_lookup (priv->states, target_state_name); new_state = g_hash_table_lookup (priv->states, target_state_name);
if (new_state == NULL) if (new_state == NULL)
@ -506,24 +500,22 @@ clutter_state_change (ClutterState *state,
animator = clutter_state_get_animator (state, animator = clutter_state_get_animator (state,
priv->source_state_name, priv->source_state_name,
priv->target_state_name); priv->target_state_name);
priv->target_state = new_state;
if (animator != NULL) if (animator != NULL)
{ { /* we've got an animator overriding the tweened animation */
priv->current_animator = animator; priv->current_animator = animator;
clutter_animator_set_timeline (animator, priv->timeline); clutter_animator_set_timeline (animator, priv->timeline);
clutter_timeline_stop (priv->timeline);
clutter_timeline_rewind (priv->timeline);
clutter_timeline_start (priv->timeline);
return priv->timeline;
} }
else
{
for (k = new_state->keys; k != NULL; k = k->next) for (k = new_state->keys; k != NULL; k = k->next)
{ {
ClutterStateKey *key = k->data; ClutterStateKey *key = k->data;
GValue initial = { 0, }; GValue initial = { 0, };
g_value_init (&initial, clutter_interval_get_value_type (key->interval)); g_value_init (&initial, clutter_interval_get_value_type (
key->interval));
g_object_get_property (key->object, key->property_name, &initial); g_object_get_property (key->object, key->property_name, &initial);
if (clutter_alpha_get_mode (key->alpha) != key->mode) if (clutter_alpha_get_mode (key->alpha) != key->mode)
@ -534,10 +526,25 @@ clutter_state_change (ClutterState *state,
g_value_unset (&initial); g_value_unset (&initial);
} }
}
priv->target_state = new_state; if (!animate)
{
clutter_timeline_stop (priv->timeline);
clutter_timeline_advance (priv->timeline, duration);
/* emit signals, to change properties, and indicate that the
* state change is complete */
g_signal_emit_by_name (priv->timeline, "new-frame",
GINT_TO_POINTER(duration), NULL);
g_signal_emit_by_name (priv->timeline, "completed", NULL);
}
else
{
clutter_timeline_stop (priv->timeline);
clutter_timeline_rewind (priv->timeline); clutter_timeline_rewind (priv->timeline);
clutter_timeline_start (priv->timeline); clutter_timeline_start (priv->timeline);
}
return priv->timeline; return priv->timeline;
} }