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

GtkFontButton: Use the same font name as the font chooser

Browse Source 
The font chooser constructs the display name for the font from
the family and face names. Do the same in the font button, so
we don't end up calling the same font by different names, which
would be confusing.
This commit is contained in:
Matthias Clasen 2014-08-15 14:10:55 -04:00
parent dd6c2391d2
commit e23f7c13b0
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gtk/gtkfontbutton.c
View File

@ -1142,20 +1142,17 @@ static void
gtk_font_button_update_font_info (GtkFontButton *font_button) gtk_font_button_update_font_info (GtkFontButton *font_button)
{ {
GtkFontButtonPrivate *priv = font_button->priv; GtkFontButtonPrivate *priv = font_button->priv;
const gchar *fam_name;
const gchar *face_name;
gchar *family_style; gchar *family_style;
g_assert (priv->font_desc != NULL); fam_name = pango_font_family_get_name (priv->font_family);
face_name = pango_font_face_get_face_name (priv->font_face);
if (priv->show_style) if (priv->show_style)
{ family_style = g_strconcat (fam_name, " ", face_name, NULL);
PangoFontDescription *desc = pango_font_description_copy_static (priv->font_desc);
pango_font_description_unset_fields (desc, PANGO_FONT_MASK_SIZE);
family_style = pango_font_description_to_string (desc);
pango_font_description_free (desc);
}
else else
family_style = g_strdup (pango_font_description_get_family (priv->font_desc)); family_style = g_strdup (fam_name);
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);