From 80ed6173ec2484c6b4e767c43c9b070569c8fcba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 12 Apr 2005 08:12:59 +0000 Subject: [PATCH] Hinting works now and is enabled, the support for transformed text is probably completely broken now. To reenable it, the font loading needs to ask for vector glyphs when there will be a transformation. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@12335 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../drawing/Painter/font_support/AGGTextRenderer.cpp | 10 ++++++---- .../app/drawing/Painter/font_support/TextRenderer.cpp | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp index 7c7b3dc4d7..e866e36b6a 100644 --- a/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp +++ b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp @@ -31,6 +31,8 @@ #include "AGGTextRenderer.h" +#define FLIP_Y false + // rect_to_int inline void rect_to_int(BRect r, @@ -53,7 +55,7 @@ AGGTextRenderer::AGGTextRenderer() { fCurves.approximation_scale(2.0); fContour.auto_detect_orientation(false); - fFontEngine.flip_y(true); + fFontEngine.flip_y(FLIP_Y); } AGGTextRenderer::AGGTextRenderer(BMessage* archive) @@ -66,7 +68,7 @@ AGGTextRenderer::AGGTextRenderer(BMessage* archive) //printf("AGGTextRenderer::AGGTextRenderer(BMessage*)\n"); fCurves.approximation_scale(2.0); fContour.auto_detect_orientation(false); - fFontEngine.flip_y(true); + fFontEngine.flip_y(FLIP_Y); } // constructor @@ -79,7 +81,7 @@ AGGTextRenderer::AGGTextRenderer(const AGGTextRenderer& from) { fCurves.approximation_scale(2.0); fContour.auto_detect_orientation(false); - fFontEngine.flip_y(true); + fFontEngine.flip_y(FLIP_Y); } // destructor @@ -193,7 +195,7 @@ AGGTextRenderer::RenderString(const char* string, bool dryRun, BPoint* nextCharPos) { - fFontEngine.hinting(false); + fFontEngine.hinting(fHinted); fFontEngine.height((int32)(fPtSize)); fFontEngine.width((int32)(fPtSize)); diff --git a/src/servers/app/drawing/Painter/font_support/TextRenderer.cpp b/src/servers/app/drawing/Painter/font_support/TextRenderer.cpp index 413c171673..04d53c30c8 100644 --- a/src/servers/app/drawing/Painter/font_support/TextRenderer.cpp +++ b/src/servers/app/drawing/Painter/font_support/TextRenderer.cpp @@ -16,7 +16,7 @@ // constructor TextRenderer::TextRenderer() : fPtSize(12.0), - fHinted(false), + fHinted(true), fAntialias(true), fKerning(true), fOpacity(255), @@ -28,7 +28,7 @@ TextRenderer::TextRenderer() TextRenderer::TextRenderer(BMessage* archive) : fPtSize(12.0), - fHinted(false), + fHinted(true), fAntialias(true), fKerning(true), fOpacity(255), @@ -76,7 +76,7 @@ TextRenderer::TextRenderer(BMessage* archive) // constructor TextRenderer::TextRenderer(const TextRenderer& from) : fPtSize(12.0), - fHinted(false), + fHinted(true), fAntialias(true), fKerning(true), fOpacity(255),