mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-28 23:09:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Updated baseline calculation for fonts

Browse Source 
svn path=/trunk/netsurf/; revision=11512
This commit is contained in:
Sven Weidauer 2011-01-28 07:36:09 +00:00
parent 46a9e334a0
commit a1f1138479
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cocoa/font.m
View File

@ -118,14 +118,13 @@ 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 );
if (layout == nil) return;
if ([cocoa_text_storage length] > 0) {
NSFont *font = [cocoa_text_storage attribute: NSFontAttributeName atIndex: 0 effectiveRange: NULL];
CGFloat baseline = [layout defaultBaselineOffsetForFont: font];
NSRange glyphRange = [layout glyphRangeForTextContainer: cocoa_text_container];
[layout drawGlyphsForGlyphRange: glyphRange atPoint: NSMakePoint( x, y - baseline )];
}
NSFont *font = [cocoa_text_storage attribute: NSFontAttributeName atIndex: 0 effectiveRange: NULL];
CGFloat baseline = [layout defaultLineHeightForFont: font] * 3.0 / 4.0;
NSRange glyphRange = [layout glyphRangeForTextContainer: cocoa_text_container];
[layout drawGlyphsForGlyphRange: glyphRange atPoint: NSMakePoint( x, y - baseline )];
}