[gnome-todo] timeline: Remove shortcircuit for linear mode
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-todo] timeline: Remove shortcircuit for linear mode
- Date: Sat, 3 Apr 2021 21:43:36 +0000 (UTC)
commit b9af21ce0cf1dda6eb5d981370a8f0c520376eeb
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Sun Mar 7 11:59:59 2021 -0300
timeline: Remove shortcircuit for linear mode
src/animation/gtd-timeline.c | 21 ++++++---------------
1 file changed, 6 insertions(+), 15 deletions(-)
---
diff --git a/src/animation/gtd-timeline.c b/src/animation/gtd-timeline.c
index a88de020..73035582 100644
--- a/src/animation/gtd-timeline.c
+++ b/src/animation/gtd-timeline.c
@@ -831,6 +831,7 @@ gtd_timeline_init (GtdTimeline *self)
GtdTimelinePrivate *priv = gtd_timeline_get_instance_private (self);
priv->progress_mode = GTD_EASE_LINEAR;
+ priv->progress_func = timeline_progress_func;
}
/**
@@ -1240,14 +1241,10 @@ gtd_timeline_get_progress (GtdTimeline *self)
priv = gtd_timeline_get_instance_private (self);
- /* short-circuit linear progress */
- if (priv->progress_func == NULL)
- return (gdouble) priv->elapsed_time_us / (gdouble) priv->duration_us;
- else
- return priv->progress_func (self,
- (gdouble) priv->elapsed_time_us,
- (gdouble) priv->duration_us,
- priv->progress_data);
+ return priv->progress_func (self,
+ (gdouble) priv->elapsed_time_us,
+ (gdouble) priv->duration_us,
+ priv->progress_data);
}
/**
@@ -1549,13 +1546,7 @@ gtd_timeline_set_progress_mode (GtdTimeline *self,
priv->progress_notify (priv->progress_data);
priv->progress_mode = mode;
-
- /* short-circuit linear progress */
- if (priv->progress_mode != GTD_EASE_LINEAR)
- priv->progress_func = timeline_progress_func;
- else
- priv->progress_func = NULL;
-
+ priv->progress_func = timeline_progress_func;
priv->progress_data = NULL;
priv->progress_notify = NULL;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]