AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

fontchooser: Assume NULL screen means the default screen

Browse Source 
... and update the font list only when the screen actually changes.
This commit is contained in:
Benjamin Otte 2011-09-19 18:35:57 +02:00
parent ae5f82e455
commit 64d3350264
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gtk/gtkfontchooserwidget.c
View File

@ -715,9 +715,6 @@ populate_list (GtkFontChooserWidget *fontchooser,
gchar *tmp;
gchar *family_and_face;
if (!gtk_widget_has_screen (GTK_WIDGET (fontchooser)))
return;
pango_context_list_families (gtk_widget_get_pango_context (GTK_WIDGET (treeview)),
&families,
&n_families);
@ -967,6 +964,12 @@ gtk_font_chooser_widget_screen_changed (GtkWidget *widget,
if (GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->screen_changed)
GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->screen_changed (widget, previous_screen);
if (previous_screen == NULL)
previous_screen = gdk_screen_get_default ();
if (previous_screen == gtk_widget_get_screen (widget))
return;
populate_list (fontchooser,
GTK_TREE_VIEW (priv->family_face_list),
priv->model);