[goffice] FormatSel: another deprecation.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] FormatSel: another deprecation.
- Date: Sun, 28 Dec 2014 22:59:21 +0000 (UTC)
commit 6eeb61cd4f49a968c50c90c9607db493acf8fe8f
Author: Morten Welinder <terra gnome org>
Date: Sun Dec 28 17:48:16 2014 -0500
FormatSel: another deprecation.
goffice/gtk/go-format-sel.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/goffice/gtk/go-format-sel.c b/goffice/gtk/go-format-sel.c
index ddab987..fc10d35 100644
--- a/goffice/gtk/go-format-sel.c
+++ b/goffice/gtk/go-format-sel.c
@@ -1513,15 +1513,18 @@ nfs_init (GOFormatSel *gfs)
PangoContext *context;
GtkWidget *w = GTK_WIDGET (gfs->format.preview);
gint char_width;
+ PangoFontDescription *font_desc;
/* request width in number of chars */
+ gtk_style_context_get (gtk_widget_get_style_context (w), GTK_STATE_FLAG_NORMAL,
+ "font", &font_desc, NULL);
context = gtk_widget_get_pango_context (w);
- metrics = pango_context_get_metrics (context,
- gtk_style_context_get_font (gtk_widget_get_style_context
(w), GTK_STATE_FLAG_NORMAL),
+ metrics = pango_context_get_metrics (context, font_desc,
pango_context_get_language (context));
char_width = pango_font_metrics_get_approximate_char_width (metrics);
gtk_widget_set_size_request (w, PANGO_PIXELS (char_width) * FORMAT_PREVIEW_MAX, -1);
pango_font_metrics_unref (metrics);
+ pango_font_description_free (font_desc);
}
gfs->format.preview_buffer = gtk_text_view_get_buffer (gfs->format.preview);
go_create_std_tags_for_buffer (gfs->format.preview_buffer);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]