From 0ed0c3bab62f0f4233bbf235a2c02f20ca48ea94 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 13 Feb 2002 22:50:57 +0000 Subject: [PATCH] Use pango_context_get_metrics instead of loading the font. 2002-02-13 Anders Carlsson * src/theme.c (meta_pango_font_desc_get_text_height): Use pango_context_get_metrics instead of loading the font. --- ChangeLog | 5 +++++ src/theme.c | 10 +++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84b761753..92b528839 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-02-13 Anders Carlsson + + * src/theme.c (meta_pango_font_desc_get_text_height): Use + pango_context_get_metrics instead of loading the font. + 2002-02-12 Anders Carlsson * src/frames.c (meta_frames_manage_window): Set prelit_control diff --git a/src/theme.c b/src/theme.c index f241593d9..028db0d30 100644 --- a/src/theme.c +++ b/src/theme.c @@ -4664,16 +4664,12 @@ meta_pango_font_desc_get_text_height (PangoFontDescription *font_desc, PangoContext *context) { PangoFontMetrics *metrics; - PangoFont *font; PangoLanguage *lang; int retval; - - font = pango_context_load_font (context, font_desc); + lang = pango_context_get_language (context); - metrics = pango_font_get_metrics (font, lang); - - g_object_unref (G_OBJECT (font)); - + metrics = pango_context_get_metrics (context, font_desc, lang); + retval = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) + pango_font_metrics_get_descent (metrics));