AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'wip/exalm/overshoot-changes' into 'master'

Browse Source 
scrolledwindow: Cancel overshoot on dimension changes

Closes #3752

See merge request GNOME/gtk!3300
This commit is contained in:
Carlos Garnacho 2021-04-01 12:11:15 +00:00
commit 1e9e7bf0d9
3 changed files with 79 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gtk/gtkkineticscrolling.c
View File

@ -123,6 +123,35 @@ gtk_kinetic_scrolling_new (double lower,
return data; return data;
} }
GtkKineticScrollingChange
gtk_kinetic_scrolling_update_size (GtkKineticScrolling *data,
double lower,
double upper)
{
GtkKineticScrollingChange change = GTK_KINETIC_SCROLLING_CHANGE_NONE;
if (lower != data->lower)
{
if (data->position <= lower)
change |= GTK_KINETIC_SCROLLING_CHANGE_LOWER;
data->lower = lower;
}
if (upper != data->upper)
{
if (data->position >= data->upper)
change |= GTK_KINETIC_SCROLLING_CHANGE_UPPER;
data->upper = upper;
}
if (data->phase == GTK_KINETIC_SCROLLING_PHASE_OVERSHOOTING)
change |= GTK_KINETIC_SCROLLING_CHANGE_IN_OVERSHOOT;
return change;
}
void void
gtk_kinetic_scrolling_free (GtkKineticScrolling *kinetic) gtk_kinetic_scrolling_free (GtkKineticScrolling *kinetic)
{ {

11
gtk/gtkkineticscrollingprivate.h
View File

@ -23,6 +23,13 @@
G_BEGIN_DECLS G_BEGIN_DECLS
typedef enum {
GTK_KINETIC_SCROLLING_CHANGE_NONE = 0,
GTK_KINETIC_SCROLLING_CHANGE_LOWER = 1 << 0,
GTK_KINETIC_SCROLLING_CHANGE_UPPER = 1 << 1,
GTK_KINETIC_SCROLLING_CHANGE_IN_OVERSHOOT = 1 << 2,
} GtkKineticScrollingChange;
typedef struct _GtkKineticScrolling GtkKineticScrolling; typedef struct _GtkKineticScrolling GtkKineticScrolling;
GtkKineticScrolling * gtk_kinetic_scrolling_new (double lower, GtkKineticScrolling * gtk_kinetic_scrolling_new (double lower,
@ -34,6 +41,10 @@ GtkKineticScrolling * gtk_kinetic_scrolling_new (double lower
double initial_velocity); double initial_velocity);
void gtk_kinetic_scrolling_free (GtkKineticScrolling *kinetic); void gtk_kinetic_scrolling_free (GtkKineticScrolling *kinetic);
GtkKineticScrollingChange gtk_kinetic_scrolling_update_size (GtkKineticScrolling *data,
double lower,
double upper);
gboolean gtk_kinetic_scrolling_tick (GtkKineticScrolling *data, gboolean gtk_kinetic_scrolling_tick (GtkKineticScrolling *data,
double time_delta, double time_delta,
double *position, double *position,

39
gtk/gtkscrolledwindow.c
View File

@ -3455,6 +3455,24 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
if (priv->hscrollbar_visible != visible) if (priv->hscrollbar_visible != visible)
gtk_widget_queue_resize (GTK_WIDGET (scrolled_window)); gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
if (priv->hscrolling)
{
GtkKineticScrollingChange change;
double lower = gtk_adjustment_get_lower (adjustment);
double upper = gtk_adjustment_get_upper (adjustment);
upper -= gtk_adjustment_get_page_size (adjustment);
change = gtk_kinetic_scrolling_update_size (priv->hscrolling, lower, upper);
if ((change & GTK_KINETIC_SCROLLING_CHANGE_IN_OVERSHOOT) &&
(change & (GTK_KINETIC_SCROLLING_CHANGE_UPPER | GTK_KINETIC_SCROLLING_CHANGE_LOWER)))
{
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_scrollbar_get_adjustment (GTK_SCROLLBAR (priv->vscrollbar))) else if (adjustment == gtk_scrollbar_get_adjustment (GTK_SCROLLBAR (priv->vscrollbar)))
@ -3468,8 +3486,29 @@ gtk_scrolled_window_adjustment_changed (GtkAdjustment *adjustment,
if (priv->vscrollbar_visible != visible) if (priv->vscrollbar_visible != visible)
gtk_widget_queue_resize (GTK_WIDGET (scrolled_window)); gtk_widget_queue_resize (GTK_WIDGET (scrolled_window));
if (priv->vscrolling)
{
GtkKineticScrollingChange change;
double lower = gtk_adjustment_get_lower (adjustment);
double upper = gtk_adjustment_get_upper (adjustment);
upper -= gtk_adjustment_get_page_size (adjustment);
change = gtk_kinetic_scrolling_update_size (priv->vscrolling, lower, upper);
if ((change & GTK_KINETIC_SCROLLING_CHANGE_IN_OVERSHOOT) &&
(change & (GTK_KINETIC_SCROLLING_CHANGE_UPPER | GTK_KINETIC_SCROLLING_CHANGE_LOWER)))
{
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 static void