diff options
| author | Rob Kendrick <rjek@netsurf-browser.org> | 2006-08-17 21:28:40 +0000 |
|---|---|---|
| committer | Rob Kendrick <rjek@netsurf-browser.org> | 2006-08-17 21:28:40 +0000 |
| commit | 465c7204b9a0bf01429920c2f56b4b51b62c89a2 (patch) | |
| tree | ee30992ba8ed648d71818b1925fd9199440381c6 /gtk | |
| parent | 9203dacfac5f84bfe8fd1fac704b59c8802fe150 (diff) | |
| download | netsurf-465c7204b9a0bf01429920c2f56b4b51b62c89a2.tar.gz netsurf-465c7204b9a0bf01429920c2f56b4b51b62c89a2.tar.bz2 | |
Make nsgtk's rendering pay attention to font name choices
svn path=/trunk/netsurf/; revision=2863
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/font_pango.c | 39 |
1 files changed, 19 insertions, 20 deletions
diff --git a/gtk/font_pango.c b/gtk/font_pango.c index 0f38cbce5..132c4ffae 100644 --- a/gtk/font_pango.c +++ b/gtk/font_pango.c @@ -254,7 +254,25 @@ PangoFontDescription *nsfont_style_to_description( assert(style->font_size.size == CSS_FONT_SIZE_LENGTH); - desc = pango_font_description_new(); + switch (style->font_family) { + case CSS_FONT_FAMILY_SERIF: + desc = pango_font_description_from_string(option_font_serif); + break; + case CSS_FONT_FAMILY_MONOSPACE: + desc = pango_font_description_from_string(option_font_mono); + break; + case CSS_FONT_FAMILY_CURSIVE: + desc = pango_font_description_from_string(option_font_cursive); + break; + case CSS_FONT_FAMILY_FANTASY: + desc = pango_font_description_from_string(option_font_fantasy); + break; + case CSS_FONT_FAMILY_SANS_SERIF: + default: + desc = pango_font_description_from_string(option_font_sans); + break; + } + if (style->font_size.value.length.unit == CSS_UNIT_PX) size = style->font_size.value.length.value; @@ -303,25 +321,6 @@ PangoFontDescription *nsfont_style_to_description( else pango_font_description_set_size(desc, size); - switch (style->font_family) { - case CSS_FONT_FAMILY_SERIF: - pango_font_description_set_family_static(desc, "Serif"); - break; - case CSS_FONT_FAMILY_MONOSPACE: - pango_font_description_set_family_static(desc, "Monospace"); - break; - case CSS_FONT_FAMILY_CURSIVE: - pango_font_description_set_family_static(desc, "Cursive"); - break; - case CSS_FONT_FAMILY_FANTASY: - pango_font_description_set_family_static(desc, "Fantasy"); - break; - case CSS_FONT_FAMILY_SANS_SERIF: - default: - pango_font_description_set_family_static(desc, "Sans"); - break; - } - switch (style->font_variant) { case CSS_FONT_VARIANT_SMALL_CAPS: pango_font_description_set_variant(desc, PANGO_VARIANT_SMALL_CAPS); |