From 478ea44a8680be050b47d2b0673d71cb11c4836a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 17 May 2004 03:16:35 +0000 Subject: [PATCH] Remove two useless lines. (#142479, Morten Welinder) * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless lines. (#142479, Morten Welinder) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkhruler.c | 5 +---- 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index acc6727ac5..e50ea1f57e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sun May 16 23:11:47 2004 Matthias Clasen + + Merged from 2.4: + + * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless + lines. (#142479, Morten Welinder) + Sun May 16 22:27:17 2004 Matthias Clasen * gtk/gtkintl.h (Q_): Add a Q_() macro. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index acc6727ac5..e50ea1f57e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Sun May 16 23:11:47 2004 Matthias Clasen + + Merged from 2.4: + + * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless + lines. (#142479, Morten Welinder) + Sun May 16 22:27:17 2004 Matthias Clasen * gtk/gtkintl.h (Q_): Add a Q_() macro. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index acc6727ac5..e50ea1f57e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Sun May 16 23:11:47 2004 Matthias Clasen + + Merged from 2.4: + + * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless + lines. (#142479, Morten Welinder) + Sun May 16 22:27:17 2004 Matthias Clasen * gtk/gtkintl.h (Q_): Add a Q_() macro. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index acc6727ac5..e50ea1f57e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Sun May 16 23:11:47 2004 Matthias Clasen + + Merged from 2.4: + + * gtk/gtkhruler.c (gtk_hruler_draw_ticks): Remove two useless + lines. (#142479, Morten Welinder) + Sun May 16 22:27:17 2004 Matthias Clasen * gtk/gtkintl.h (Q_): Add a Q_() macro. diff --git a/gtk/gtkhruler.c b/gtk/gtkhruler.c index f91a1bad82..07d549e8bf 100644 --- a/gtk/gtkhruler.c +++ b/gtk/gtkhruler.c @@ -164,13 +164,10 @@ gtk_hruler_draw_ticks (GtkRuler *ruler) xthickness = widget->style->xthickness; ythickness = widget->style->ythickness; - digit_height = PANGO_PIXELS (ink_rect.height) + 2; - digit_offset = ink_rect.y; - layout = gtk_widget_create_pango_layout (widget, "012456789"); pango_layout_get_extents (layout, &ink_rect, &logical_rect); - digit_height = PANGO_PIXELS (ink_rect.height) + 1; + digit_height = PANGO_PIXELS (ink_rect.height) + 2; digit_offset = ink_rect.y; width = widget->allocation.width;