[empathy] Port to GtkStyleContext
- From: Emilio Pozuelo Monfort <epm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [empathy] Port to GtkStyleContext
- Date: Tue, 11 Jan 2011 11:38:31 +0000 (UTC)
commit 0ffc53acc1c6993100c08e85180a10daf817556b
Author: Emilio Pozuelo Monfort <emilio pozuelo collabora co uk>
Date: Mon Jan 10 12:27:00 2011 +0000
Port to GtkStyleContext
configure.ac | 2 +-
libempathy-gtk/empathy-cell-renderer-text.c | 18 ++++++++++++------
2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index ff33f04..4e310ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ AC_COPYRIGHT([
FOLKS_REQUIRED=0.3.3
GLIB_REQUIRED=2.27.2
GNUTLS_REQUIRED=2.8.5
-GTK_REQUIRED=2.91.6
+GTK_REQUIRED=2.99.0
KEYRING_REQUIRED=2.26.0
GCR_REQUIRED=2.91.4
LIBCANBERRA_GTK_REQUIRED=0.25
diff --git a/libempathy-gtk/empathy-cell-renderer-text.c b/libempathy-gtk/empathy-cell-renderer-text.c
index d0590ef..d52abb4 100644
--- a/libempathy-gtk/empathy-cell-renderer-text.c
+++ b/libempathy-gtk/empathy-cell-renderer-text.c
@@ -298,10 +298,12 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
gboolean selected)
{
EmpathyCellRendererTextPriv *priv;
+ const PangoFontDescription *font_desc;
PangoAttrList *attr_list;
PangoAttribute *attr_color = NULL, *attr_size;
- GtkStyle *style;
+ GtkStyleContext *style;
gchar *str;
+ gint font_size;
priv = GET_PRIV (cell);
@@ -324,21 +326,25 @@ cell_renderer_text_update_text (EmpathyCellRendererText *cell,
return;
}
- style = gtk_widget_get_style (widget);
+ style = gtk_widget_get_style_context (widget);
attr_list = pango_attr_list_new ();
- attr_size = pango_attr_size_new (pango_font_description_get_size (style->font_desc) / 1.2);
+ font_desc = gtk_style_context_get_font (style, GTK_STATE_FLAG_NORMAL);
+ font_size = pango_font_description_get_size (font_desc);
+ attr_size = pango_attr_size_new (font_size / 1.2);
attr_size->start_index = strlen (priv->name) + 1;
attr_size->end_index = -1;
pango_attr_list_insert (attr_list, attr_size);
if (!selected) {
- GdkColor color;
+ GdkRGBA color;
- color = style->text_aa[GTK_STATE_NORMAL];
+ gtk_style_context_get_color (style, 0, &color);
- attr_color = pango_attr_foreground_new (color.red, color.green, color.blue);
+ attr_color = pango_attr_foreground_new (color.red * 0xffff,
+ color.green * 0xffff,
+ color.blue * 0xffff);
attr_color->start_index = attr_size->start_index;
attr_color->end_index = -1;
pango_attr_list_insert (attr_list, attr_color);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]