gtk+ r21080 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Mon Aug 11 21:07:36 2008
New Revision: 21080
URL: http://svn.gnome.org/viewvc/gtk+?rev=21080&view=rev

Log:
2008-08-11  Michael Natterer  <mitch imendio com>

	Bug 546754 â 2.13.6 update create rendering issue in the evolution
	composer

	* gtk/gtkadjustment.c: instead of CLAMP(), use

	value = MIN (value, upper - page_size);
	value = MAX (value, lower);

	so we don't end up below lower if upper - page_size is smaller
	than lower.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkadjustment.c

Modified: trunk/gtk/gtkadjustment.c
==============================================================================
--- trunk/gtk/gtkadjustment.c	(original)
+++ trunk/gtk/gtkadjustment.c	Mon Aug 11 21:07:36 2008
@@ -359,7 +359,11 @@
 {
   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
 
-  value = CLAMP (value, adjustment->lower, adjustment->upper - adjustment->page_size);
+  /* 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);
 
   if (value != adjustment->value)
     {
@@ -628,7 +632,11 @@
                 "page-size", page_size,
                 NULL);
 
-  value = CLAMP (value, lower, upper - page_size);
+  /* don't use CLAMP() so we don't end up below lower if upper - page_size
+   * is smaller than lower
+   */
+  value = MIN (value, upper - page_size);
+  value = MAX (value, lower);
 
   if (value != adjustment->value)
     {