diff options
| author | Michael Drake <michael.drake@codethink.co.uk> | 2018-05-23 15:46:39 +0100 |
|---|---|---|
| committer | Michael Drake <michael.drake@codethink.co.uk> | 2018-05-23 15:46:39 +0100 |
| commit | a40dca49e8493802d7064bd8e6aaab03436568ee (patch) | |
| tree | 5a036a8ddc33423d3564b046837ff42bd46d8f61 /content/handlers/html/font.c | |
| parent | 6cabd4cd628833afa32aeb7c614ef153b4a1c985 (diff) | |
| parent | 8a931f01b958ad5862433ece6024bbde0aa4ecb8 (diff) | |
| download | netsurf-a40dca49e8493802d7064bd8e6aaab03436568ee.tar.gz netsurf-a40dca49e8493802d7064bd8e6aaab03436568ee.tar.bz2 | |
Merge branch 'tlsa/plotter-polish'
Diffstat (limited to 'content/handlers/html/font.c')
| -rw-r--r-- | content/handlers/html/font.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/content/handlers/html/font.c b/content/handlers/html/font.c index 9dbf5922b..7ebe16825 100644 --- a/content/handlers/html/font.c +++ b/content/handlers/html/font.c @@ -144,14 +144,15 @@ void font_plot_style_from_css( fstyle->family = plot_font_generic_family( css_computed_font_family(css, &families)); + fstyle->families = families; css_computed_font_size(css, &length, &unit); fstyle->size = FIXTOINT(FMUL(nscss_len2pt(len_ctx, length, unit), - INTTOFIX(FONT_SIZE_SCALE))); + INTTOFIX(PLOT_STYLE_SCALE))); /* Clamp font size to configured minimum */ - if (fstyle->size < (nsoption_int(font_min_size) * FONT_SIZE_SCALE) / 10) - fstyle->size = (nsoption_int(font_min_size) * FONT_SIZE_SCALE) / 10; + if (fstyle->size < (nsoption_int(font_min_size) * PLOT_STYLE_SCALE) / 10) + fstyle->size = (nsoption_int(font_min_size) * PLOT_STYLE_SCALE) / 10; fstyle->weight = plot_font_weight(css_computed_font_weight(css)); fstyle->flags = plot_font_flags(css_computed_font_style(css), |