[gtk+/gtk-style-context: 343/347] GtkWidget: Update pango context from style context's font description.
- From: Carlos Garnacho <carlosg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-style-context: 343/347] GtkWidget: Update pango context from style context's font description.
- Date: Thu, 11 Nov 2010 01:33:20 +0000 (UTC)
commit 3c90a19e88f2c048eda1c534a3531e7677a0dcbd
Author: Carlos Garnacho <carlosg gnome org>
Date: Tue Nov 9 18:31:39 2010 +0100
GtkWidget: Update pango context from style context's font description.
gtk/gtkwidget.c | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 2fd6d6c..cdbd418 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -8768,12 +8768,22 @@ static void
update_pango_context (GtkWidget *widget,
PangoContext *context)
{
- GtkWidgetPrivate *priv = widget->priv;
+ PangoFontDescription *font_desc;
+ GtkStyleContext *style_context;
+
+ style_context = gtk_widget_get_style_context (widget);
- pango_context_set_font_description (context, priv->style->font_desc);
+ gtk_style_context_get (style_context,
+ gtk_widget_get_state_flags (widget),
+ "font", &font_desc,
+ NULL);
+
+ pango_context_set_font_description (context, font_desc);
pango_context_set_base_dir (context,
gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR ?
PANGO_DIRECTION_LTR : PANGO_DIRECTION_RTL);
+
+ pango_font_description_free (font_desc);
}
static void
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]