diff options
| author | Sven Weidauer <sven.weidauer@gmail.com> | 2011-03-04 14:53:16 +0000 |
|---|---|---|
| committer | Sven Weidauer <sven.weidauer@gmail.com> | 2011-03-04 14:53:16 +0000 |
| commit | b73a68edabc3012d00d7a26afd24a581de7c23a8 (patch) | |
| tree | 4146333ee5842e779d72b9d4630fba0821e5093a /cocoa | |
| parent | d2626ece458fe70f6492ef056e0bff471e335840 (diff) | |
| download | netsurf-b73a68edabc3012d00d7a26afd24a581de7c23a8.tar.gz netsurf-b73a68edabc3012d00d7a26afd24a581de7c23a8.tar.bz2 | |
Fixed text scaling.
svn path=/trunk/netsurf/; revision=11905
Diffstat (limited to 'cocoa')
| -rw-r--r-- | cocoa/font.m | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cocoa/font.m b/cocoa/font.m index 1b06d3dc7..a109d027f 100644 --- a/cocoa/font.m +++ b/cocoa/font.m @@ -113,7 +113,10 @@ void cocoa_set_font_scale_factor( float newFactor ) void cocoa_draw_string( CGFloat x, CGFloat y, const char *bytes, size_t length, const plot_font_style_t *style ) { - NSLayoutManager *layout = cocoa_prepare_layout_manager( bytes, length, style ); + plot_font_style_t actualStyle = *style; + actualStyle.size = (CGFloat)actualStyle.size * cocoa_font_scale_factor; + + NSLayoutManager *layout = cocoa_prepare_layout_manager( bytes, length, &actualStyle ); if (layout == nil) return; NSFont *font = [cocoa_text_storage attribute: NSFontAttributeName atIndex: 0 effectiveRange: NULL]; @@ -219,7 +222,7 @@ static NSString * const cocoa_font_families[PLOT_FONT_FAMILY_COUNT] = { static inline NSFont *cocoa_font_get_nsfont( const plot_font_style_t *style ) { NSFont *font = [NSFont fontWithName: cocoa_font_families[style->family] - size: cocoa_font_scale_factor * (CGFloat)style->size / FONT_SIZE_SCALE]; + size: (CGFloat)style->size / FONT_SIZE_SCALE]; NSFontTraitMask traits = 0; if (style->flags & FONTF_ITALIC || style->flags & FONTF_OBLIQUE) traits |= NSItalicFontMask; |