summaryrefslogtreecommitdiff
path: root/gtk/gtkscrolledwindow.c
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2010-05-24 04:04:10 +0200
committerJavier Jardón <jjardon@gnome.org>2010-05-24 15:39:30 +0200
commitb18b33ae8234982dcc4e694358cbcbc32c3e7e3a (patch)
tree3ace9b0ebece960e37dec037873011c528608f57 /gtk/gtkscrolledwindow.c
parent14f7717770c9304822abe00728d0ebdf50210f68 (diff)
downloadgtk+-b18b33ae8234982dcc4e694358cbcbc32c3e7e3a.tar.gz
Revert "Forward-port a GtkAdjustment compatibility fix"
In the early 2.14.x releases, GtkAdjustment was changed to enforce that values are restricted to the range [lower, upper - page_size]. This has always been the documented behaviour, and the recommended practice is to set page_size to 0 when using adjustments for simple scalar values, like in a slider or spin button. Due to the large number of applications that are affected by this change, the behaviour has been reverted to the old behaviour in 2.14.3, with an explicit warning that this change will be reintroduced in 2.90. This reverts commit e6373738fc9c53c95e467a3681fcd3426fd94d13. https://bugzilla.gnome.org/show_bug.cgi?id=619474
Diffstat (limited to 'gtk/gtkscrolledwindow.c')
-rw-r--r--gtk/gtkscrolledwindow.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index bf3cda9b1b..11adb7aa62 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -1220,8 +1220,6 @@ gtk_scrolled_window_scroll_child (GtkScrolledWindow *scrolled_window,
break;
}
- value = CLAMP (value, adjustment->lower, adjustment->upper - adjustment->page_size);
-
gtk_adjustment_set_value (adjustment, value);
return TRUE;
@@ -1513,13 +1511,11 @@ gtk_scrolled_window_scroll_event (GtkWidget *widget,
if (range && gtk_widget_get_visible (range))
{
GtkAdjustment *adj = GTK_RANGE (range)->adjustment;
- gdouble delta, new_value;
+ gdouble delta;
delta = _gtk_range_get_wheel_delta (GTK_RANGE (range), event->direction);
- new_value = CLAMP (adj->value + delta, adj->lower, adj->upper - adj->page_size);
-
- gtk_adjustment_set_value (adj, new_value);
+ gtk_adjustment_set_value (adj, adj->value + delta);
return TRUE;
}