summaryrefslogtreecommitdiff
path: root/src/frames.c
diff options
context:
space:
mode:
authorAlex Graveley <alex@ximian.com>2001-09-21 19:20:56 +0000
committerAlex Graveley <orph@src.gnome.org>2001-09-21 19:20:56 +0000
commit38a878171ae1831b9c12e4fd019b967ac3e4ea67 (patch)
treef07910d9cd1a2afa5c9380018edb71c196f6d315 /src/frames.c
parentdad1b107f5f52ac86ff251542bcd3adf2a2604a3 (diff)
downloadmetacity-38a878171ae1831b9c12e4fd019b967ac3e4ea67.tar.gz
metacity-38a878171ae1831b9c12e4fd019b967ac3e4ea67.tar.bz2
Add inlinepixbufs.h so that it gets generated.
2001-09-21 Alex Graveley <alex@ximian.com> * src/Makefile.am (metacity_SOURCES): Add inlinepixbufs.h so that it gets generated. * src/frames.c (meta_frames_style_set): Update for new opaque PangoFontMetrics.
Diffstat (limited to 'src/frames.c')
-rw-r--r--src/frames.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/frames.c b/src/frames.c
index 22d5fd0..6af4ecd 100644
--- a/src/frames.c
+++ b/src/frames.c
@@ -458,18 +458,22 @@ meta_frames_style_set (GtkWidget *widget,
*(frames->props) = props;
{
- PangoFontMetrics metrics;
+ PangoFontMetrics *metrics;
PangoFont *font;
PangoLanguage *lang;
font = pango_context_load_font (gtk_widget_get_pango_context (widget),
widget->style->font_desc);
lang = pango_context_get_language (gtk_widget_get_pango_context (widget));
- pango_font_get_metrics (font, lang, &metrics);
+ metrics = pango_font_get_metrics (font, lang);
g_object_unref (G_OBJECT (font));
- frames->text_height = PANGO_PIXELS (metrics.ascent + metrics.descent);
+ frames->text_height =
+ PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
+ pango_font_metrics_get_descent (metrics));
+
+ pango_font_metrics_unref (metrics);
}
/* Queue a draw/resize on all frames */