Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/chergert/overshoot_width' into 'main'

Browse Source 
kineticscrolling: use overshoot_width in calculation

See merge request GNOME/gtk!7851
This commit is contained in:
Matthias Clasen
2024-10-22 17:47:28 +00:00
parent f5413c5226 8d537a943f
commit 1731530189
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkkineticscrolling.c
View File

@@ -98,6 +98,7 @@ gtk_kinetic_scrolling_new (gint64 frame_time,
data->upper = upper;
data->decel_friction = decel_friction;
data->overshoot_friction = overshoot_friction;
data->overshoot_width = overshoot_width;
if (initial_position < lower)
{
gtk_kinetic_scrolling_init_overshoot (data,
@@ -211,14 +212,15 @@ gtk_kinetic_scrolling_tick (GtkKineticScrolling *data,
case GTK_KINETIC_SCROLLING_PHASE_OVERSHOOTING:
{
double half_overshoot_width = data->overshoot_width / 2.;
double exp_part, pos;
exp_part = exp (-data->overshoot_friction / 2 * t);
pos = exp_part * (data->c1 + data->c2 * t);
if (pos < data->lower - 50 || pos > data->upper + 50)
if (pos < data->lower - half_overshoot_width || pos > data->upper + half_overshoot_width)
{
pos = CLAMP (pos, data->lower - 50, data->upper + 50);
pos = CLAMP (pos, data->lower - half_overshoot_width, data->upper + half_overshoot_width);
gtk_kinetic_scrolling_init_overshoot (data, frame_time, data->equilibrium_position, pos, 0);
}
else