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

Fix parsing of the font: shorthand

Browse Source 
Our code here was just throwing it at PangoFontDescription.
Fix this by parsing the various components ourselves.
This commit is contained in:
Matthias Clasen 2016-04-18 11:43:29 -04:00
parent 7b9b661aea
commit dcd20e17e5
1 changed files with 30 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
gtk/gtkcssshorthandpropertyimpl.c
View File

@ -429,47 +429,42 @@ parse_font (GtkCssShorthandProperty *shorthand,
GtkCssValue **values, GtkCssValue **values,
GtkCssParser *parser) GtkCssParser *parser)
{ {
PangoFontDescription *desc; gboolean parsed_one;
guint mask;
char *str;
str = _gtk_css_parser_read_value (parser); do
if (str == NULL) {
return FALSE; parsed_one = FALSE;
desc = pango_font_description_from_string (str); if (values[1] == NULL)
g_free (str); {
values[1] = _gtk_css_font_style_value_try_parse (parser);
parsed_one = parsed_one || values[1] != NULL;
}
mask = pango_font_description_get_set_fields (desc); if (values[2] == NULL)
{
values[2] = _gtk_css_font_variant_value_try_parse (parser);
parsed_one = parsed_one || values[2] != NULL;
}
if (mask & PANGO_FONT_MASK_FAMILY) if (values[3] == NULL)
{ {
values[0] = _gtk_css_array_value_new (_gtk_css_string_value_new (pango_font_description_get_family (desc))); values[3] = _gtk_css_font_weight_value_try_parse (parser);
} parsed_one = parsed_one || values[3] != NULL;
if (mask & PANGO_FONT_MASK_STYLE) }
{
values[1] = _gtk_css_font_style_value_new (pango_font_description_get_style (desc));
}
if (mask & PANGO_FONT_MASK_VARIANT)
{
values[2] = _gtk_css_font_variant_value_new (pango_font_description_get_variant (desc));
}
if (mask & PANGO_FONT_MASK_WEIGHT)
{
values[3] = _gtk_css_font_weight_value_new (pango_font_description_get_weight (desc));
}
if (mask & PANGO_FONT_MASK_STRETCH)
{
values[4] = _gtk_css_font_stretch_value_new (pango_font_description_get_stretch (desc));
}
if (mask & PANGO_FONT_MASK_SIZE)
{
values[5] = _gtk_css_number_value_new ((double) pango_font_description_get_size (desc) / PANGO_SCALE, GTK_CSS_PX);
}
pango_font_description_free (desc); if (values[4] == NULL)
{
values[4] = _gtk_css_font_weight_value_try_parse (parser);
parsed_one = parsed_one || values[4] != NULL;
}
}
while (parsed_one && !value_is_done_parsing (parser));
return TRUE; values[5] = gtk_css_font_size_value_parse (parser);
values[0] = gtk_css_font_family_value_parse (parser);
return values[0] != NULL && values[5] != NULL;
} }
static gboolean static gboolean