Rewrite the code that deals with smooth scroll events to
be in terms of 'scroll units' as well.
gboolean handled = FALSE;
gdouble delta_x;
gdouble delta_y;
gboolean handled = FALSE;
gdouble delta_x;
gdouble delta_y;
g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (widget), FALSE);
g_return_val_if_fail (GTK_IS_SCROLLED_WINDOW (widget), FALSE);
- g_return_val_if_fail (event != NULL, FALSE);
+ g_return_val_if_fail (event != NULL, FALSE);
scrolled_window = GTK_SCROLLED_WINDOW (widget);
priv = scrolled_window->priv;
scrolled_window = GTK_SCROLLED_WINDOW (widget);
priv = scrolled_window->priv;
{
GtkAdjustment *adj;
gdouble new_value;
{
GtkAdjustment *adj;
gdouble new_value;
+ gdouble page_size;
+ gdouble scroll_unit;
adj = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar));
adj = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar));
+ page_size = gtk_adjustment_get_page_size (adj);
+ scroll_unit = pow (page_size, 2.0 / 3.0);
- new_value = CLAMP (gtk_adjustment_get_value (adj) + delta_x,
+ new_value = CLAMP (gtk_adjustment_get_value (adj) + delta_x * scroll_unit,
gtk_adjustment_get_lower (adj),
gtk_adjustment_get_upper (adj) -
gtk_adjustment_get_page_size (adj));
gtk_adjustment_get_lower (adj),
gtk_adjustment_get_upper (adj) -
gtk_adjustment_get_page_size (adj));
{
GtkAdjustment *adj;
gdouble new_value;
{
GtkAdjustment *adj;
gdouble new_value;
+ gdouble page_size;
+ gdouble scroll_unit;
adj = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar));
adj = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar));
+ page_size = gtk_adjustment_get_page_size (adj);
+ scroll_unit = pow (page_size, 2.0 / 3.0);
- new_value = CLAMP (gtk_adjustment_get_value (adj) + delta_y,
+ new_value = CLAMP (gtk_adjustment_get_value (adj) + delta_y * scroll_unit,
gtk_adjustment_get_lower (adj),
gtk_adjustment_get_upper (adj) -
gtk_adjustment_get_page_size (adj));
gtk_adjustment_get_lower (adj),
gtk_adjustment_get_upper (adj) -
gtk_adjustment_get_page_size (adj));
if (range && gtk_widget_get_visible (range))
{
GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range));
if (range && gtk_widget_get_visible (range))
{
GtkAdjustment *adj = gtk_range_get_adjustment (GTK_RANGE (range));
- gdouble delta, new_value;
delta = _gtk_range_get_wheel_delta (GTK_RANGE (range), event);
delta = _gtk_range_get_wheel_delta (GTK_RANGE (range), event);