callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkFontChooser: Iterate over faces as well as families to list them

Browse Source
This commit is contained in:
Alberto Ruiz
2011-04-16 11:28:46 +01:00
committed by Matthias Clasen
parent f854a46890
commit b79802789d
1 changed files with 43 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
gtk/gtkfontchooser.c
View File

@ -131,7 +131,7 @@ struct _GtkFontSelectionDialogPrivate
#define FONT_STYLE_LIST_WIDTH 170 #define FONT_STYLE_LIST_WIDTH 170
#define FONT_SIZE_LIST_WIDTH 60 #define FONT_SIZE_LIST_WIDTH 60
#define ROW_FORMAT_STRING "<span size=\"small\" foreground=\"%s\">%s %s</span>\n<span>%s</span>" #define ROW_FORMAT_STRING "<span foreground=\"%s\">%s %s</span>\n<span font_desc=\"%s\">%s</span>"
/* These are what we use as the standard font sizes, for the size list. /* These are what we use as the standard font sizes, for the size list.
*/ */
@ -393,7 +393,7 @@ gtk_font_selection_populate_list (GtkTreeView *treeview)
GtkListStore *model; GtkListStore *model;
PangoFontFamily *match_family; PangoFontFamily *match_family;
PangoFontFamily **families; PangoFontFamily **families;
gint n_families, n_faces, i, j; gint n_families, i;
GtkTreeIter match_row; GtkTreeIter match_row;
GString *tmp = g_string_new (NULL); GString *tmp = g_string_new (NULL);
const gchar* row_format = ROW_FORMAT_STRING; const gchar* row_format = ROW_FORMAT_STRING;
@ -408,31 +408,52 @@ gtk_font_selection_populate_list (GtkTreeView *treeview)
gtk_list_store_clear (model); gtk_list_store_clear (model);
/* FIXME: Get theme color here */
for (i=0; i<n_families; i++) for (i=0; i<n_families; i++)
{ {
const gchar *name = pango_font_family_get_name (families[i]);
GtkTreeIter iter; GtkTreeIter iter;
PangoFontFace **faces;
int j, n_faces;
const gchar *fam_name = pango_font_family_get_name (families[i]);
/* foreground_color, default family, face, family, desc, sample string */ pango_font_family_list_faces (families[i], &faces, &n_faces);
for (j=0; j<n_faces; j++)
{
PangoFontDescription *pango_desc = pango_font_face_describe (faces[j]);
const gchar *face_name = pango_font_face_get_face_name (faces[j]);
gchar *font_desc = pango_font_description_to_string (pango_desc);
/* foreground_color, family_name, face_name, desc, sample string */
g_string_printf (tmp, ROW_FORMAT_STRING, g_string_printf (tmp, ROW_FORMAT_STRING,
"darkgrey", "darkgrey", /* FIXME: This has to be a theme color */
"sans", /* FIXME: This has to be the global font */ fam_name,
"Regular", face_name,
font_desc,
PREVIEW_TEXT); PREVIEW_TEXT);
gtk_list_store_append (model, &iter); gtk_list_store_append (model, &iter);
gtk_list_store_set (model, &iter, gtk_list_store_set (model, &iter,
FAMILY_COLUMN, families[i], FAMILY_COLUMN, families[i],
FAMILY_NAME_COLUMN, name, FACE_COLUMN, faces[j],
FAMILY_NAME_COLUMN, fam_name,
TEXT_COLUMN, tmp->str, TEXT_COLUMN, tmp->str,
-1); -1);
if (i == 0 || !g_ascii_strcasecmp (name, "sans")) if ((i == 0 && j == 0) ||
(!g_ascii_strcasecmp (face_name, "sans") && j == 0))
{ {
match_family = families[i]; match_family = families[i];
match_row = iter; match_row = iter;
} }
pango_font_description_free(pango_desc);
g_free (font_desc);
}
g_free (faces);
} }
set_cursor_to_iter (treeview, &match_row); set_cursor_to_iter (treeview, &match_row);
@ -460,7 +481,6 @@ gtk_font_selection_bootstrap_fontlist (GtkTreeView* treeview)
col = gtk_tree_view_column_new_with_attributes ("Family", col = gtk_tree_view_column_new_with_attributes ("Family",
gtk_cell_renderer_text_new (), gtk_cell_renderer_text_new (),
"markup", TEXT_COLUMN, "markup", TEXT_COLUMN,
"font", FAMILY_NAME_COLUMN,
NULL); NULL);
gtk_tree_view_append_column (treeview, col); gtk_tree_view_append_column (treeview, col);