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

fontchooser: Handle families without faces

Browse Source 
This might seem useless, but I've met fonts
where pango_font_family_get_face (family, NULL)
return NULL. Handle it without criticals.
This commit is contained in:
Matthias Clasen 2020-09-20 10:39:24 -04:00
parent 81793b62d8
commit 3c62cd90d4
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk/gtkfontchooserwidget.c
View File

@ -738,10 +738,13 @@ get_font_attributes (GObject *ignore,
face = pango_font_family_get_face (item, NULL);
else
face = item;
font_desc = pango_font_face_describe (face);
attribute = pango_attr_font_desc_new (font_desc);
pango_attr_list_insert (attrs, attribute);
pango_font_description_free (font_desc);
if (face)
{
font_desc = pango_font_face_describe (face);
attribute = pango_attr_font_desc_new (font_desc);
pango_attr_list_insert (attrs, attribute);
pango_font_description_free (font_desc);
}
}
return attrs;
@ -1044,6 +1047,9 @@ add_languages_from_font (GtkFontChooserWidget *self,
else
face = PANGO_FONT_FACE (item);
if (!face)
return;
desc = pango_font_face_describe (face);
pango_font_description_set_size (desc, 20);