Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added support for retrieving the position of the virtual next char, for some reason the kerning is handled correctly across multiple calls to RenderString, it must somehow make sense from looking at the code, but I don't follow it this late in the night...

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10721 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus 2005-01-14 02:19:23 +00:00
parent 8837f9f78d
commit 6303609fca
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/servers/app/server/Painter/font_support/AGGTextRenderer.cpp
View File

@ -195,7 +195,8 @@ void
AGGTextRenderer::RenderString(const char* string,
font_renderer_solid_type* solidRenderer,
font_renderer_bin_type* binRenderer,
const Transformable& transform)
const Transformable& transform,
BPoint* nextCharPos)
{
fFontEngine.hinting(fHinted);
fFontEngine.height((int32)(fPtSize/* * 16.0*/));
@ -258,7 +259,6 @@ AGGTextRenderer::RenderString(const char* string,
if (glyph) {
if (fKerning) {
// fFontManager.add_kerning(&x, &y);
fFontManager.add_kerning(&advanceX, &advanceY);
}
@ -309,13 +309,19 @@ AGGTextRenderer::RenderString(const char* string,
}
// increment pen position
// x += glyph->advance_x + (fAdvanceScale - 1.0) * fFontEngine.height();
// y += glyph->advance_y;
advanceX = fHinted ? floorf(glyph->advance_x + 0.5) : glyph->advance_x;
advanceY = fHinted ? floorf(glyph->advance_y + 0.5) : glyph->advance_y;
}
++p;
}
if (nextCharPos) {
x += fAdvanceScale * advanceX;
if (advanceX > 0.0 && fAdvanceScale > 1.0)
x += (fAdvanceScale - 1.0) * fFontEngine.height();
y += advanceY;
nextCharPos->x = x;
nextCharPos->y = y;
}
} else {
fprintf(stderr, "UTF8 -> Unicode conversion failed: %s\n", strerror(ret));
}
@ -378,7 +384,6 @@ AGGTextRenderer::Bounds(const char* string,
if (glyph) {
if (fKerning) {
// fFontManager.add_kerning(&x, &y);
fFontManager.add_kerning(&advanceX, &advanceY);
}
@ -421,8 +426,6 @@ AGGTextRenderer::Bounds(const char* string,
bounds = bounds.IsValid() ? bounds | t : t;
// increment pen position
// x += glyph->advance_x + (fAdvanceScale - 1.0) * fFontEngine.height();
// y += glyph->advance_y;
advanceX = fHinted ? floorf(glyph->advance_x + 0.5) : glyph->advance_x;
advanceY = fHinted ? floorf(glyph->advance_y + 0.5) : glyph->advance_y;
}

3
src/servers/app/server/Painter/font_support/AGGTextRenderer.h
View File

@ -32,7 +32,8 @@ class AGGTextRenderer : public TextRenderer {
virtual void RenderString(const char* utf8String,
font_renderer_solid_type* solidRenderer,
font_renderer_bin_type* binRenderer,
const Transformable& transform);
const Transformable& transform,
BPoint* nextCharPos = NULL);
virtual BRect Bounds(const char* utf8String,
const Transformable& transform);