From 74bc87842f0c8c6874ddcc547d86644583e6a2cd Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 11 Aug 2008 21:07:36 +0000 Subject: [PATCH] =?UTF-8?q?Bug=20546754=20=E2=80=93=202.13.6=20update=20cr?= =?UTF-8?q?eate=20rendering=20issue=20in=20the=20evolution?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2008-08-11 Michael Natterer 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 --- ChangeLog | 13 +++++++++++++ gtk/gtkadjustment.c | 12 ++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d68b26e40..6016cb4a13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-08-11 Michael Natterer + + 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 Bug 546616 – CUPS print backend uses 1.2 API without guards diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c index 16e76ede8e..dd1b3f609d 100644 --- a/gtk/gtkadjustment.c +++ b/gtk/gtkadjustment.c @@ -359,7 +359,11 @@ gtk_adjustment_set_value (GtkAdjustment *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) { @@ -628,7 +632,11 @@ gtk_adjustment_configure (GtkAdjustment *adjustment, "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) {