callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkTimeline: don't look when animations are disabled

Browse Source 
Otherwise, we end up doing maximal work with minimal effect, and
bring the X server to 100% CPU. Note that this makes spinner widgets
look really unclear, but they really have to be changed to adapt
to enable-animations == FALSE at the widget level.
This commit is contained in:
Matthias Clasen 2011-04-14 08:56:07 -04:00
parent dd28e22aa1
commit c43ada95aa
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtktimeline.c
View File

@ -340,7 +340,13 @@ gtk_timeline_run_frame (GtkTimeline *timeline)
if ((priv->direction == GTK_TIMELINE_DIRECTION_FORWARD && progress == 1.0) || if ((priv->direction == GTK_TIMELINE_DIRECTION_FORWARD && progress == 1.0) ||
(priv->direction == GTK_TIMELINE_DIRECTION_BACKWARD && progress == 0.0)) (priv->direction == GTK_TIMELINE_DIRECTION_BACKWARD && progress == 0.0))
{ {
if (!priv->loop) gboolean loop;
loop = priv->loop && priv->animations_enabled;
if (loop)
_gtk_timeline_rewind (timeline);
else
{ {
if (priv->source_id) if (priv->source_id)
{ {
@ -351,8 +357,6 @@ gtk_timeline_run_frame (GtkTimeline *timeline)
g_signal_emit (timeline, signals [FINISHED], 0); g_signal_emit (timeline, signals [FINISHED], 0);
return FALSE; return FALSE;
} }
else
_gtk_timeline_rewind (timeline);
} }
return TRUE; return TRUE;
@ -417,7 +421,7 @@ _gtk_timeline_start (GtkTimeline *timeline)
g_object_get (settings, "gtk-enable-animations", &enable_animations, NULL); g_object_get (settings, "gtk-enable-animations", &enable_animations, NULL);
} }
priv->animations_enabled = (enable_animations == TRUE); priv->animations_enabled = enable_animations;
g_signal_emit (timeline, signals [STARTED], 0); g_signal_emit (timeline, signals [STARTED], 0);