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

fontbutton: Display the same text as elsewhere

Browse Source 
In particular, display names of families that don't have an installed
font.
This commit is contained in:
Benjamin Otte
2011-09-22 21:21:59 +02:00
parent 18a6d9803e
commit 19623af04e
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
gtk/gtkfontbutton.c
View File

@ -1168,21 +1168,16 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
g_assert (priv->font_desc != NULL); g_assert (priv->font_desc != NULL);
if (priv->show_style && if (priv->show_style)
priv->font_family != NULL &&
priv->font_face != NULL &&
g_ascii_strcasecmp (pango_font_face_get_face_name (priv->font_face), "Regular") != 0)
{ {
family_style = g_strdup_printf ("%s %s", PangoFontDescription *desc = pango_font_description_copy_static (priv->font_desc);
pango_font_family_get_name (priv->font_family),
pango_font_face_get_face_name (priv->font_face));
pango_font_description_unset_fields (desc, PANGO_FONT_MASK_SIZE);
family_style = pango_font_description_to_string (desc);
pango_font_description_free (desc);
} }
else if (priv->font_family != NULL)
family_style = g_strdup (pango_font_family_get_name (priv->font_family));
else else
family_style = g_strdup (""); family_style = g_strdup (pango_font_description_get_family (priv->font_desc));
gtk_label_set_text (GTK_LABEL (font_button->priv->font_label), family_style); gtk_label_set_text (GTK_LABEL (font_button->priv->font_label), family_style);
g_free (family_style); g_free (family_style);