AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-30 11:07:38 +00:00
Code Issues Projects Releases Wiki Activity

fontchooser: Store the font description in the model

Browse Source 
It's actually expensive to create (>5ms per font with >1000 fonts
installed), so better cache it.
This commit is contained in:
Benjamin Otte 2011-09-19 17:58:51 +02:00
parent 6d8010d3d4
commit ae5f82e455
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gtk/gtkfontchooserwidget.c
View File

@ -126,6 +126,7 @@ static const gint font_sizes[] = {
enum { enum {
FAMILY_COLUMN, FAMILY_COLUMN,
FACE_COLUMN, FACE_COLUMN,
FONT_DESC_COLUMN,
PREVIEW_TEXT_COLUMN, PREVIEW_TEXT_COLUMN,
PREVIEW_TITLE_COLUMN PREVIEW_TITLE_COLUMN
}; };
@ -765,6 +766,7 @@ populate_list (GtkFontChooserWidget *fontchooser,
gtk_list_store_insert_with_values (model, &iter, -1, gtk_list_store_insert_with_values (model, &iter, -1,
FAMILY_COLUMN, families[i], FAMILY_COLUMN, families[i],
FACE_COLUMN, faces[j], FACE_COLUMN, faces[j],
FONT_DESC_COLUMN, pango_desc,
PREVIEW_TITLE_COLUMN, family_and_face, PREVIEW_TITLE_COLUMN, family_and_face,
PREVIEW_TEXT_COLUMN, tmp, PREVIEW_TEXT_COLUMN, tmp,
-1); -1);
@ -886,9 +888,10 @@ gtk_font_chooser_widget_bootstrap_fontlist (GtkFontChooserWidget *fontchooser)
GtkCellRenderer *cell; GtkCellRenderer *cell;
GtkTreeViewColumn *col; GtkTreeViewColumn *col;
priv->model = gtk_list_store_new (4, priv->model = gtk_list_store_new (5,
PANGO_TYPE_FONT_FAMILY, PANGO_TYPE_FONT_FAMILY,
PANGO_TYPE_FONT_FACE, PANGO_TYPE_FONT_FACE,
PANGO_TYPE_FONT_DESCRIPTION,
G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING); G_TYPE_STRING);