summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/theme.c10
2 files changed, 8 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 84b7617..92b5288 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-13 Anders Carlsson <andersca@gnu.org>
+
+ * 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 <andersca@gnu.org>
* src/frames.c (meta_frames_manage_window): Set prelit_control
diff --git a/src/theme.c b/src/theme.c
index f241593..028db0d 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));