[gtk/wip/carlosg/fix-accumulated-velocity: 47/50] gtkscrolledwindow: Refactor kinetic scroll animation
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/wip/carlosg/fix-accumulated-velocity: 47/50] gtkscrolledwindow: Refactor kinetic scroll animation
- Date: Sat, 19 Mar 2022 00:49:31 +0000 (UTC)
commit 5df1a3d097fac21180b7997199c33d2d7445c6a4
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Mar 15 21:59:12 2022 +0100
gtkscrolledwindow: Refactor kinetic scroll animation
Do not depend on the kinetic scroll helpers existing or not before
exiting the animation, as we may want to keep those a little bit
longer after stopped.
gtk/gtkscrolledwindow.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 416c8288eb..a5294d8003 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -3268,6 +3268,7 @@ scrolled_window_deceleration_cb (GtkWidget *widget,
GtkAdjustment *hadjustment, *vadjustment;
gint64 current_time;
double position, elapsed;
+ gboolean retval = G_SOURCE_REMOVE;
current_time = gdk_frame_clock_get_frame_time (frame_clock);
elapsed = (current_time - priv->last_deceleration_time) / (double)G_TIME_SPAN_SECOND;
@@ -3283,6 +3284,7 @@ scrolled_window_deceleration_cb (GtkWidget *widget,
{
priv->unclamped_hadj_value = position;
gtk_adjustment_set_value (hadjustment, position);
+ retval = G_SOURCE_CONTINUE;
}
else if (priv->hscrolling)
g_clear_pointer (&priv->hscrolling, gtk_kinetic_scrolling_free);
@@ -3292,19 +3294,17 @@ scrolled_window_deceleration_cb (GtkWidget *widget,
{
priv->unclamped_vadj_value = position;
gtk_adjustment_set_value (vadjustment, position);
+ retval = G_SOURCE_CONTINUE;
}
else if (priv->vscrolling)
g_clear_pointer (&priv->vscrolling, gtk_kinetic_scrolling_free);
- if (!priv->hscrolling && !priv->vscrolling)
- {
- gtk_scrolled_window_cancel_deceleration (scrolled_window);
- return G_SOURCE_REMOVE;
- }
-
- gtk_scrolled_window_invalidate_overshoot (scrolled_window);
+ if (retval == G_SOURCE_REMOVE)
+ gtk_scrolled_window_cancel_deceleration (scrolled_window);
+ else
+ gtk_scrolled_window_invalidate_overshoot (scrolled_window);
- return G_SOURCE_CONTINUE;
+ return retval;
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]