isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[StyleTransition] Improve style changes during transitions

Browse Source 
Our behavior of reversing the animation when the widget's style
changes back to the previous one is sound. On the other hand, when
there's a change to a new style while a transition is active, we
simply cancel the ongoing transition. Updating the transition
correctly so that the new one starts from an intermediate state
is hard.
Nevertheless, if the style changes before any time of the transition
has elapsed, we should do better than the current behavior.

https://bugzilla.gnome.org/show_bug.cgi?id=621140
This commit is contained in:
Florian Müllner 2010-06-09 10:56:19 +02:00
parent f76dae5ec8
commit 49919acb7c
1 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/st/st-theme-node-transition.c
View File

@ -129,27 +129,47 @@ st_theme_node_transition_update (StThemeNodeTransition *transition,
/* If the update is the reversal of the current transition, /* If the update is the reversal of the current transition,
* we reverse the timeline. * we reverse the timeline.
* Otherwise, we should initiate a new transition from the * Otherwise, we should initiate a new transition from the
* current state to the new one; this is hard to do, so we * current state to the new one; this is hard to do if the
* just cancel the ongoing transition in that case. * transition is in an intermediate state, so we just cancel
* the ongoing transition in that case.
* Note that reversing a timeline before any time elapsed * Note that reversing a timeline before any time elapsed
* results in the timeline's time position being set to the * results in the timeline's time position being set to the
* full duration - this is not what we want, so we cancel the * full duration - this is not what we want, so we cancel the
* transition as well in that case. * transition as well in that case.
*/ */
if (st_theme_node_equal (new_node, old_node) if (st_theme_node_equal (new_node, old_node))
&& clutter_timeline_get_elapsed_time (priv->timeline) > 0)
{ {
if (direction == CLUTTER_TIMELINE_FORWARD) if (clutter_timeline_get_elapsed_time (priv->timeline) > 0)
clutter_timeline_set_direction (priv->timeline, {
CLUTTER_TIMELINE_BACKWARD); if (direction == CLUTTER_TIMELINE_FORWARD)
clutter_timeline_set_direction (priv->timeline,
CLUTTER_TIMELINE_BACKWARD);
else
clutter_timeline_set_direction (priv->timeline,
CLUTTER_TIMELINE_FORWARD);
}
else else
clutter_timeline_set_direction (priv->timeline, {
CLUTTER_TIMELINE_FORWARD); clutter_timeline_stop (priv->timeline);
g_signal_emit (transition, signals[COMPLETED], 0);
}
} }
else else
{ {
clutter_timeline_stop (priv->timeline); if (clutter_timeline_get_elapsed_time (priv->timeline) > 0)
g_signal_emit (transition, signals[COMPLETED], 0); {
clutter_timeline_stop (priv->timeline);
g_signal_emit (transition, signals[COMPLETED], 0);
}
else
{
guint new_duration = st_theme_node_get_transition_duration (new_node);
clutter_timeline_set_duration (priv->timeline, new_duration);
g_object_unref (priv->new_theme_node);
priv->new_theme_node = g_object_ref (new_node);
priv->needs_setup = TRUE;
}
} }
} }