AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-01 08:20:36 +00:00
Code Issues Projects Releases Wiki Activity

range: Use the correct size for scaling

Browse Source 
When scaling the scroll delta, always use the 'large' dimension
of a range widget. When dx was 0, the code code accidentally
use the small dimension.
This commit is contained in:
Matthias Clasen 2012-02-28 23:02:01 -05:00
parent 013da47a07
commit 6ecc1089f2
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkrange.c
View File

@ -2803,6 +2803,7 @@ _gtk_range_get_wheel_delta (GtkRange *range,
gdouble dx, dy;
gdouble delta;
gdouble page_size;
gdouble size;
page_size = gtk_adjustment_get_page_size (adjustment);
@ -2812,22 +2813,27 @@ _gtk_range_get_wheel_delta (GtkRange *range,
gtk_widget_get_allocation (GTK_WIDGET (range), &allocation);
if (gtk_orientable_get_orientation (GTK_ORIENTABLE (range)) == GTK_ORIENTATION_HORIZONTAL)
size = allocation.width;
else
size = allocation.height;
if (dx != 0 &&
gtk_orientable_get_orientation (GTK_ORIENTABLE (range)) == GTK_ORIENTATION_HORIZONTAL)
{
if (GTK_IS_SCROLLBAR (range) && page_size > 0)
delta = dx * page_size / allocation.width;
delta = dx * page_size / size;
else
delta = dx * (gtk_adjustment_get_upper (adjustment) -
gtk_adjustment_get_lower (adjustment)) / allocation.width;
gtk_adjustment_get_lower (adjustment)) / size;
}
else
{
if (GTK_IS_SCROLLBAR (range) && page_size > 0)
delta = dy * page_size / allocation.height;
delta = dy * page_size / size;
else
delta = dy * (gtk_adjustment_get_upper (adjustment) -
gtk_adjustment_get_lower (adjustment)) / allocation.height;
gtk_adjustment_get_lower (adjustment)) / size;
}
}
else