diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-23 23:05:34 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2009-07-23 23:05:34 +0000 |
commit | ddeadd1c02880367ad786b113d352a519f45ec73 (patch) | |
tree | 00b8b46ee1a3fc84e5492c2183dfaa8192d261f9 /gtk/font_pango.c | |
parent | b20949a35025b23da1bf0ac6003f4575eb94281d (diff) | |
download | netsurf-ddeadd1c02880367ad786b113d352a519f45ec73.tar.gz netsurf-ddeadd1c02880367ad786b113d352a519f45ec73.tar.bz2 |
Merge LibCSS port to trunk.
svn path=/trunk/netsurf/; revision=8752
Diffstat (limited to 'gtk/font_pango.c')
-rw-r--r-- | gtk/font_pango.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/gtk/font_pango.c b/gtk/font_pango.c index c0d789344..e4944f0be 100644 --- a/gtk/font_pango.c +++ b/gtk/font_pango.c @@ -27,6 +27,7 @@ #include <stdio.h> #include <gtk/gtk.h> #include "css/css.h" +#include "css/utils.h" #include "gtk/font_pango.h" #include "gtk/gtk_plotters.h" #include "render/font.h" @@ -55,10 +56,6 @@ const struct font_functions nsfont = { nsfont_split }; - - - - /** * Measure the width of a string. * @@ -302,12 +299,7 @@ PangoFontDescription *nsfont_style_to_description( break; } - size = fstyle->size; - - if (size < (unsigned)abs(option_font_min_size / 10) * FONT_SIZE_SCALE) - size = (option_font_min_size / 10) * FONT_SIZE_SCALE; - - size = (size * PANGO_SCALE) / FONT_SIZE_SCALE; + size = (fstyle->size * PANGO_SCALE) / FONT_SIZE_SCALE; if (fstyle->flags & FONTF_ITALIC) style = PANGO_STYLE_ITALIC; |