From 15bd48a0da1245ca61baedf09010ca6c6d452d96 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Thu, 15 Jan 2009 23:15:17 +0000 Subject: Spacing perfect, text now printing correctly on baseline. Formatting is mostly only wrong when non-local charset characters are being printed, due to the current text size calculations routines needing rewriting. svn path=/trunk/netsurf/; revision=6073 --- amiga/font.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'amiga') diff --git a/amiga/font.c b/amiga/font.c index e89090c3d..185f3bd3d 100644 --- a/amiga/font.c +++ b/amiga/font.c @@ -346,11 +346,11 @@ void ami_unicode_text(struct RastPort *rp,char *string,ULONG length,struct css_s glyphbm = glyph->glm_BitMap; if(!glyphbm) continue; - x+= glyph->glm_BlackLeft; - - BltBitMapTags(BLITA_DestX,dx+x, - BLITA_DestY,dy-glyph->glm_BlackHeight+glyph->glm_BlackTop, - BLITA_Width,glyph->glm_BlackWidth, + BltBitMapTags(BLITA_SrcX,glyph->glm_BlackLeft, + BLITA_SrcY,glyph->glm_BlackTop, + BLITA_DestX,dx+x, + BLITA_DestY,dy-glyph->glm_Y1, + BLITA_Width,glyph->glm_X1, BLITA_Height,glyph->glm_BlackHeight, BLITA_Source,glyphbm, BLITA_SrcType,BLITT_ALPHATEMPLATE, @@ -359,7 +359,7 @@ void ami_unicode_text(struct RastPort *rp,char *string,ULONG length,struct css_s BLITA_SrcBytesPerRow,glyph->glm_BMModulo, TAG_DONE); - x+= glyph->glm_BlackWidth + 1; + x+= glyph->glm_X1; EReleaseInfo(&ofont->olf_EEngine, OT_GlyphMap8Bit,glyph, -- cgit v1.2.3