i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mostly cosmetic changes, nothing of substance

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12386 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2005-04-14 00:10:41 +00:00
parent d78aea1846
commit d3665bb866
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
+12 -7
View File
@@ -4,11 +4,12 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <FontServer.h>
#include <Bitmap.h> #include <Bitmap.h>
#include <ByteOrder.h> #include <ByteOrder.h>
#include <Entry.h> #include <Entry.h>
#include <FontServer.h>
#include <Message.h> #include <Message.h>
#include <ServerFont.h>
#include <UTF8.h> #include <UTF8.h>
#include <agg_basics.h> #include <agg_basics.h>
@@ -115,6 +116,7 @@ AGGTextRenderer::Archive(BMessage* into, bool deep) const
bool bool
AGGTextRenderer::SetFont(const ServerFont &font) AGGTextRenderer::SetFont(const ServerFont &font)
{ {
//printf("AGGTextRenderer::SetFont(%s, %s)\n", font.GetFamily(), font.GetStyle());
if (fFontEngine.load_font(font, agg::glyph_ren_native_gray8)) { if (fFontEngine.load_font(font, agg::glyph_ren_native_gray8)) {
// if (fFontEngine.load_font(font, agg::glyph_ren_outline)) { // if (fFontEngine.load_font(font, agg::glyph_ren_outline)) {
return TextRenderer::SetFont(font); return TextRenderer::SetFont(font);
@@ -195,6 +197,8 @@ AGGTextRenderer::RenderString(const char* string,
bool dryRun, bool dryRun,
BPoint* nextCharPos) BPoint* nextCharPos)
{ {
//printf("RenderString(\"%s\", length: %ld, dry: %d)\n", string, length, dryRun);
fFontEngine.hinting(fHinted); fFontEngine.hinting(fHinted);
fFontEngine.height((int32)(fPtSize)); fFontEngine.height((int32)(fPtSize));
fFontEngine.width((int32)(fPtSize)); fFontEngine.width((int32)(fPtSize));
@@ -262,13 +266,11 @@ AGGTextRenderer::RenderString(const char* string,
if (glyph) { if (glyph) {
if (fKerning) { if (i > 0 && fKerning) {
fFontManager.add_kerning(&advanceX, &advanceY); fFontManager.add_kerning(&advanceX, &advanceY);
} }
x += fAdvanceScale * advanceX; x += advanceX;
if (advanceX > 0.0 && fAdvanceScale > 1.0)
x += (fAdvanceScale - 1.0) * fFontEngine.height();
y += advanceY; y += advanceY;
// calculate bounds // calculate bounds
@@ -280,6 +282,7 @@ AGGTextRenderer::RenderString(const char* string,
// we cannot use the transformation pipeline // we cannot use the transformation pipeline
double transformedX = x + transformOffset.x; double transformedX = x + transformOffset.x;
double transformedY = y + transformOffset.y; double transformedY = y + transformOffset.y;
//printf("x: %f, y: %f\n", transformedX, transformedY);
fFontManager.init_embedded_adaptors(glyph, fFontManager.init_embedded_adaptors(glyph,
transformedX, transformedX,
transformedY); transformedY);
@@ -335,11 +338,13 @@ AGGTextRenderer::RenderString(const char* string,
bounds = bounds.IsValid() ? bounds | glyphBounds : glyphBounds; bounds = bounds.IsValid() ? bounds | glyphBounds : glyphBounds;
// increment pen position // increment pen position
advanceX = fHinted ? floorf(glyph->advance_x + 0.5) : glyph->advance_x; advanceX = glyph->advance_x;
advanceY = fHinted ? floorf(glyph->advance_y + 0.5) : glyph->advance_y; advanceY = glyph->advance_y;
} }
++p; ++p;
} }
// put pen location behind rendered text
// (at the baseline of the virtual next glyph)
if (nextCharPos) { if (nextCharPos) {
x += fAdvanceScale * advanceX; x += fAdvanceScale * advanceX;
if (advanceX > 0.0 && fAdvanceScale > 1.0) if (advanceX > 0.0 && fAdvanceScale > 1.0)