[gtk/wip/exalm/overshoot-changes-gtk3] scrolledwindow: Cancel overshoot on dimension changes




commit 2c7c78ead4fcc5ebedae5665d7e3cda55842e915
Author: Alexander Mikhaylenko <alexm gnome org>
Date:   Mon Mar 15 17:17:01 2021 +0500

    scrolledwindow: Cancel overshoot on dimension changes
    
    If we scroll down in a list that's still being filled, we hit the edge and
    initiate overshoot, and then the adjustment's upper value increases. This
    leads to an unwanted bounce back.
    
    Additionally, if in a similar situation the upper value decreases, the
    overscroll glow gets stuck.
    
    Update kinetic scrolling upper and lower value on changes, and immediately
    cancel it if dimensions on that side change.
    
    Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/3752

 gtk/gtkkineticscrolling.c | 26 ++++++++++++++++++++++++++
 gtk/gtkkineticscrolling.h |  4 ++++
 gtk/gtkscrolledwindow.c   | 31 +++++++++++++++++++++++++++++++
 3 files changed, 61 insertions(+)
---
diff --git a/gtk/gtkkineticscrolling.c b/gtk/gtkkineticscrolling.c
index 9036e158dc..38db69feda 100644
--- a/gtk/gtkkineticscrolling.c
+++ b/gtk/gtkkineticscrolling.c
@@ -124,6 +124,32 @@ gtk_kinetic_scrolling_new (gdouble lower,
   return data;
 }
 
+gboolean
+gtk_kinetic_scrolling_update_size (GtkKineticScrolling *data,
+                                   gdouble              lower,
+                                   gdouble              upper)
+{
+  if (lower != data->lower)
+    {
+      if (data->phase == GTK_KINETIC_SCROLLING_PHASE_OVERSHOOTING &&
+          data->position <= lower)
+        return FALSE;
+
+      data->lower = lower;
+    }
+
+  if (upper != data->upper)
+    {
+      if (data->phase == GTK_KINETIC_SCROLLING_PHASE_OVERSHOOTING &&
+          data->position >= data->upper)
+        return FALSE;
+
+      data->upper = upper;
+    }
+
+  return TRUE;
+}
+
 void
 gtk_kinetic_scrolling_free (GtkKineticScrolling *kinetic)
 {
diff --git a/gtk/gtkkineticscrolling.h b/gtk/gtkkineticscrolling.h
index d00f1d05f6..d3feb4e3cc 100644
--- a/gtk/gtkkineticscrolling.h
+++ b/gtk/gtkkineticscrolling.h
@@ -34,6 +34,10 @@ GtkKineticScrolling *    gtk_kinetic_scrolling_new  (gdouble               lower
                                                      gdouble               initial_velocity);
 void                     gtk_kinetic_scrolling_free (GtkKineticScrolling  *kinetic);
 
+gboolean                 gtk_kinetic_scrolling_update_size (GtkKineticScrolling *data,
+                                                            gdouble              lower,
+                                                            gdouble              upper);
+
 gboolean                 gtk_kinetic_scrolling_tick (GtkKineticScrolling  *data,
                                                      gdouble               time_delta,
                                                      gdouble              *position,
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index bea7339f39..71b44c3e15 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -3900,6 +3900,20 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
 
          if (priv->hscrollbar_visible != visible)
            gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
+
+          if (priv->hscrolling)
+            {
+              gdouble lower = gtk_adjustment_get_lower (adjustment);
+              gdouble upper = gtk_adjustment_get_upper (adjustment);
+              upper -= gtk_adjustment_get_page_size (adjustment);
+
+              if (!gtk_kinetic_scrolling_update_size (priv->hscrolling, lower, upper))
+                {
+                  g_clear_pointer (&priv->hscrolling, gtk_kinetic_scrolling_free);
+                  priv->unclamped_hadj_value = gtk_adjustment_get_value (adjustment);
+                  gtk_scrolled_window_invalidate_overshoot (scrolled_window);
+                }
+            }
        }
     }
   else if (adjustment == gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar)))
@@ -3914,8 +3928,25 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
 
          if (priv->vscrollbar_visible != visible)
            gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
+
+          if (priv->vscrolling)
+            {
+              gdouble lower = gtk_adjustment_get_lower (adjustment);
+              gdouble upper = gtk_adjustment_get_upper (adjustment);
+              upper -= gtk_adjustment_get_page_size (adjustment);
+
+              if (!gtk_kinetic_scrolling_update_size (priv->vscrolling, lower, upper))
+                {
+                  g_clear_pointer (&priv->vscrolling, gtk_kinetic_scrolling_free);
+                  priv->unclamped_vadj_value = gtk_adjustment_get_value (adjustment);
+                  gtk_scrolled_window_invalidate_overshoot (scrolled_window);
+                }
+            }
        }
     }
+
+  if (!priv->hscrolling && !priv->vscrolling)
+    gtk_scrolled_window_cancel_deceleration (scrolled_window);
 }
 
 static void


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]