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

settings: Never override some font properties

Browse Source 
According to the CSS specification, everything but font-size and
font-family are defined by CSS. So we don't override them anymore.
This commit is contained in:
Benjamin Otte 2012-12-01 00:18:01 +01:00
parent be53513954
commit fe61e6b3fe
1 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtksettings.c
View File

@ -1428,23 +1428,12 @@ settings_ensure_style (GtkSettings *settings)
font_desc = pango_font_description_from_string (font_name);
/* Unset normal attributes from this description,
/* Unset attributes from this description,
* so they do not override theme values */
if (pango_font_description_get_weight (font_desc) == PANGO_WEIGHT_NORMAL)
pango_font_description_unset_fields (font_desc,
PANGO_FONT_MASK_WEIGHT);
if (pango_font_description_get_stretch (font_desc) == PANGO_STRETCH_NORMAL)
pango_font_description_unset_fields (font_desc,
PANGO_FONT_MASK_STRETCH);
if (pango_font_description_get_variant (font_desc) == PANGO_VARIANT_NORMAL)
pango_font_description_unset_fields (font_desc,
PANGO_FONT_MASK_VARIANT);
if (pango_font_description_get_style (font_desc) == PANGO_STYLE_NORMAL)
pango_font_description_unset_fields (font_desc,
PANGO_FONT_MASK_STYLE);
pango_font_description_unset_fields (font_desc, PANGO_FONT_MASK_WEIGHT);
pango_font_description_unset_fields (font_desc, PANGO_FONT_MASK_STRETCH);
pango_font_description_unset_fields (font_desc, PANGO_FONT_MASK_VARIANT);
pango_font_description_unset_fields (font_desc, PANGO_FONT_MASK_STYLE);
gtk_style_properties_set (priv->style, 0,
"font", font_desc,