diff options
author | Michael Drake <michael.drake@codethink.co.uk> | 2018-05-23 11:48:35 +0100 |
---|---|---|
committer | Michael Drake <michael.drake@codethink.co.uk> | 2018-05-23 11:48:35 +0100 |
commit | a58d97a41a6192038573da6862571dc72a560458 (patch) | |
tree | 0efc128007ea0afcc931dede3521012b19723d9f /frontends/amiga | |
parent | 6cabd4cd628833afa32aeb7c614ef153b4a1c985 (diff) | |
download | netsurf-a58d97a41a6192038573da6862571dc72a560458.tar.gz netsurf-a58d97a41a6192038573da6862571dc72a560458.tar.bz2 |
Plotters: Add plot_style_fixed type, and use for font size.
Diffstat (limited to 'frontends/amiga')
-rw-r--r-- | frontends/amiga/font_bullet.c | 4 | ||||
-rw-r--r-- | frontends/amiga/font_diskfont.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/frontends/amiga/font_bullet.c b/frontends/amiga/font_bullet.c index c8ad34c04..62c2dde08 100644 --- a/frontends/amiga/font_bullet.c +++ b/frontends/amiga/font_bullet.c @@ -63,7 +63,7 @@ #define NSA_VALUE_SHEARSIN (1 << 14) #define NSA_VALUE_SHEARCOS (1 << 16) -#define NSA_FONT_EMWIDTH(s) (s / FONT_SIZE_SCALE) * (ami_font_dpi_get_xdpi() / 72.0) +#define NSA_FONT_EMWIDTH(s) (s / PLOT_STYLE_SCALE) * (ami_font_dpi_get_xdpi() / 72.0) const uint16 sc_table[] = { 0x0061, 0x1D00, /* a */ @@ -512,7 +512,7 @@ static struct OutlineFont *ami_open_outline_font(const plot_font_style_t *fstyle } /* Scale to 16.16 fixed point */ - ysize = fstyle->size * ((1 << 16) / FONT_SIZE_SCALE); + ysize = fstyle->size * ((1 << 16) / PLOT_STYLE_SCALE); if(designed_node == NULL) { ofont = node->font; diff --git a/frontends/amiga/font_diskfont.c b/frontends/amiga/font_diskfont.c index 2da3f0038..a587d6eaf 100644 --- a/frontends/amiga/font_diskfont.c +++ b/frontends/amiga/font_diskfont.c @@ -97,7 +97,7 @@ static struct TextFont *ami_font_bm_open(struct RastPort *rp, const plot_font_st snprintf(font, MAX_FONT_NAME_SIZE, "%s.font", fontname); tattr.ta_Name = font; - tattr.ta_YSize = fstyle->size / FONT_SIZE_SCALE; + tattr.ta_YSize = fstyle->size / PLOT_STYLE_SCALE; NSLOG(netsurf, INFO, "font: %s/%d", tattr.ta_Name, tattr.ta_YSize); if(prev_font != NULL) CloseFont(prev_font); |