From ddeadd1c02880367ad786b113d352a519f45ec73 Mon Sep 17 00:00:00 2001 From: John Mark Bell Date: Thu, 23 Jul 2009 23:05:34 +0000 Subject: Merge LibCSS port to trunk. svn path=/trunk/netsurf/; revision=8752 --- gtk/font_pango.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gtk/font_pango.c') 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 #include #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; -- cgit v1.2.3