[gtk+] GtkFontChooser: Remove the themed color for the font title
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkFontChooser: Remove the themed color for the font title
- Date: Mon, 15 Aug 2011 23:53:46 +0000 (UTC)
commit 9dee34ad27b8bb0ef3df8006162e926232a3bc68
Author: Alberto Ruiz <aruiz gnome org>
Date: Thu Jul 14 00:09:34 2011 +0100
GtkFontChooser: Remove the themed color for the font title
gtk/gtkfontchooser.c | 15 +--------------
1 files changed, 1 insertions(+), 14 deletions(-)
---
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index 1a84c89..13ef6bf 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -117,7 +117,7 @@ struct _GtkFontChooserPrivate
#define FONT_STYLE_LIST_WIDTH 170
#define FONT_SIZE_LIST_WIDTH 60
-#define ROW_FORMAT_STRING "<span weight=\"bold\" size=\"small\" foreground=\"%s\">%s</span>\n<span size=\"x-large\" font_desc=\"%s\">%s</span>"
+#define ROW_FORMAT_STRING "<span weight=\"bold\" size=\"small\">%s</span>\n<span size=\"x-large\" font_desc=\"%s\">%s</span>"
/* These are what we use as the standard font sizes, for the size list.
*/
@@ -667,9 +667,6 @@ static void
populate_list (GtkFontChooser *fontchooser, GtkTreeView* treeview, GtkListStore* model)
{
GtkStyleContext *style_context;
- GdkRGBA g_color;
- PangoColor p_color;
- gchar *color_string;
PangoFontDescription *default_font;
GtkTreeIter match_row;
@@ -691,14 +688,6 @@ populate_list (GtkFontChooser *fontchooser, GtkTreeView* treeview, GtkListStore*
/* Get row header font color */
style_context = gtk_widget_get_style_context (GTK_WIDGET (treeview));
- gtk_style_context_get_color (style_context,
- GTK_STATE_FLAG_NORMAL | GTK_STATE_FLAG_INSENSITIVE,
- &g_color);
-
- p_color.red = (guint16)((gdouble)G_MAXUINT16 * g_color.red);
- p_color.green = (guint16)((gdouble)G_MAXUINT16 * g_color.green);
- p_color.blue = (guint16)((gdouble)G_MAXUINT16 * g_color.blue);
- color_string = pango_color_to_string (&p_color);
/* Get theme font */
default_font = (PangoFontDescription*) gtk_style_context_get_font (style_context,
@@ -727,7 +716,6 @@ populate_list (GtkFontChooser *fontchooser, GtkTreeView* treeview, GtkListStore*
face_name);
g_string_printf (tmp, ROW_FORMAT_STRING,
- color_string,
family_and_face->str,
font_desc,
fontchooser->priv->preview_text);
@@ -763,7 +751,6 @@ populate_list (GtkFontChooser *fontchooser, GtkTreeView* treeview, GtkListStore*
g_string_free (family_and_face, TRUE);
g_string_free (tmp, TRUE);
- g_free (color_string);
g_free (families);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]