diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-06-26 15:15:00 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-06-26 15:15:00 +0000 |
commit | 671b3b0eb06ede434e5e64ff77e7444634cb59a1 (patch) | |
tree | a599235c68a5ff79d620ff372517815c5e869ff8 /gtk/gtkentry.c | |
parent | bd2b9eebafdbec4f72fb6660b82acfef6ad4c190 (diff) | |
download | gtk+-671b3b0eb06ede434e5e64ff77e7444634cb59a1.tar.gz |
Use new pango_context_get_metrics() to fix problems with font lists in
Tue Jun 26 11:06:34 2001 Owen Taylor <otaylor@redhat.com>
* gtk/gtkclist.c gtk/gtkentry.c gtk/gtkspinbutton.c:
Use new pango_context_get_metrics() to fix problems
with font lists in descriptions. (#56184, reported by
Jonas Borgström)
Diffstat (limited to 'gtk/gtkentry.c')
-rw-r--r-- | gtk/gtkentry.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c index 6cdaf71e29..7a0753acd3 100644 --- a/gtk/gtkentry.c +++ b/gtk/gtkentry.c @@ -1035,7 +1035,6 @@ gtk_entry_size_request (GtkWidget *widget, { GtkEntry *entry; PangoFontMetrics metrics; - PangoFont *font; gint xborder, yborder; PangoContext *context; @@ -1045,15 +1044,11 @@ gtk_entry_size_request (GtkWidget *widget, entry = GTK_ENTRY (widget); - /* hackish for now, get metrics - */ context = gtk_widget_get_pango_context (widget); - font = pango_context_load_font (context, widget->style->font_desc); - pango_font_get_metrics (font, - pango_context_get_language (context), - &metrics); - - g_object_unref (G_OBJECT (font)); + pango_context_get_metrics (context, + widget->style->font_desc, + pango_context_get_language (context), + &metrics); entry->ascent = metrics.ascent; entry->descent = metrics.descent; |