callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 546754 – 2.13.6 update create rendering issue in the evolution

Browse Source 
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.


svn path=/trunk/; revision=21080
This commit is contained in:
Michael Natterer
2008-08-11 21:07:36 +00:00
committed by Michael Natterer
parent 6f789132c5
commit 74bc87842f
2 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ChangeLog
View File

@ -1,3 +1,16 @@
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.
2008-08-11 Matthias Clasen <mclasen@redhat.com> 2008-08-11 Matthias Clasen <mclasen@redhat.com>
Bug 546616 – CUPS print backend uses 1.2 API without guards Bug 546616 – CUPS print backend uses 1.2 API without guards

12
gtk/gtkadjustment.c
View File

@ -359,7 +359,11 @@ gtk_adjustment_set_value (GtkAdjustment *adjustment,
{ {
g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment)); 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) if (value != adjustment->value)
{ {
@ -628,7 +632,11 @@ gtk_adjustment_configure (GtkAdjustment *adjustment,
"page-size", page_size, "page-size", page_size,
NULL); 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) if (value != adjustment->value)
{ {