summaryrefslogtreecommitdiff
path: root/gtk/gtkadjustment.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2009-05-03 13:04:06 -0400
committerMatthias Clasen <mclasen@redhat.com>2009-05-03 13:04:06 -0400
commite6373738fc9c53c95e467a3681fcd3426fd94d13 (patch)
treef590ec182722637e3c797ea64337ad3d6f3896a6 /gtk/gtkadjustment.c
parent46bc2ec740c9c3b86fad9c373342e0851ca0bf43 (diff)
downloadgtk+-e6373738fc9c53c95e467a3681fcd3426fd94d13.tar.gz
Forward-port a GtkAdjustment compatibility fix
We reverted GtkAdjustment to its traditional behaviour wrt. to clamping in 2.14.3, but the fix was lost between 2.14 and 2.16.
Diffstat (limited to 'gtk/gtkadjustment.c')
-rw-r--r--gtk/gtkadjustment.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index dd1b3f609d..49f5008ec2 100644
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -359,11 +359,7 @@ gtk_adjustment_set_value (GtkAdjustment *adjustment,
{
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
- /* don't use CLAMP() so we don't end up below lower if upper - page_size
- * is smaller than lower
- */
- value = MIN (value, adjustment->upper - adjustment->page_size);
- value = MAX (value, adjustment->lower);
+ value = CLAMP (value, adjustment->lower, adjustment->upper);
if (value != adjustment->value)
{