summaryrefslogtreecommitdiff
path: root/gtk/gtkprogresstracker.c
diff options
context:
space:
mode:
authorBenjamin Otte <otte@redhat.com>2017-11-12 06:19:00 +0100
committerBenjamin Otte <otte@redhat.com>2017-11-12 06:22:34 +0100
commitb47ff72ebc626180fc14459a66fd06e64fedcdb2 (patch)
treef3891d42091787732e4792f3cb10732cfe4733d8 /gtk/gtkprogresstracker.c
parent6eead8f6a3564e9b54a234188398b34cc7949f3b (diff)
downloadgtk+-b47ff72ebc626180fc14459a66fd06e64fedcdb2.tar.gz
progresstracker: Don't hand out NaN
When the duration is set to 0, clamp it to 1us. This way we're almost correct: We should really instantly finish, but we don't. But we do respect the delay. Doing this properly would require some refactoring of how the progress tracker actually maintains progress, and this is just a quick fix.
Diffstat (limited to 'gtk/gtkprogresstracker.c')
-rw-r--r--gtk/gtkprogresstracker.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk/gtkprogresstracker.c b/gtk/gtkprogresstracker.c
index 81cca35d19..0ddcbfbe4c 100644
--- a/gtk/gtkprogresstracker.c
+++ b/gtk/gtkprogresstracker.c
@@ -82,7 +82,7 @@ gtk_progress_tracker_start (GtkProgressTracker *tracker,
tracker->is_running = TRUE;
tracker->last_frame_time = 0;
tracker->duration = duration;
- tracker->iteration = - delay / (gdouble) duration;
+ tracker->iteration = - delay / (gdouble) MAX (duration, 1);
tracker->iteration_count = iteration_count;
}
@@ -108,7 +108,7 @@ gtk_progress_tracker_finish (GtkProgressTracker *tracker)
**/
void
gtk_progress_tracker_advance_frame (GtkProgressTracker *tracker,
- guint64 frame_time)
+ guint64 frame_time)
{
gdouble delta;
@@ -127,7 +127,7 @@ gtk_progress_tracker_advance_frame (GtkProgressTracker *tracker,
return;
}
- delta = (frame_time - tracker->last_frame_time) / gtk_slowdown / tracker->duration;
+ delta = (frame_time - tracker->last_frame_time) / gtk_slowdown / MAX (tracker->duration, 1);
tracker->last_frame_time = frame_time;
tracker->iteration += delta;
}