From 361475b0a642ddd220dace4f58796cb14076c68d Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Tue, 10 Apr 2007 18:52:24 +0000 Subject: [PATCH] This fix the hiniting issue we have seen crop ypqg before u did not see it was drawing. This commit cause a smaller glitch in cmd. Please some help me figout how to fix this glitch in cmd other wise I will be force revert this commit. svn path=/trunk/; revision=26306 --- reactos/subsystems/win32/win32k/objects/text.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c index cd9bc1c7a81..92eabe233e4 100644 --- a/reactos/subsystems/win32/win32k/objects/text.c +++ b/reactos/subsystems/win32/win32k/objects/text.c @@ -367,12 +367,11 @@ IntGdiAddFontResource(PUNICODE_STRING FileName, DWORD Characteristics) /* FIXME: Complete text metrics */ XScale = Face->size->metrics.x_scale; YScale = Face->size->metrics.y_scale; - -#if 0 /* This (Wine) code doesn't seem to work correctly for us */ - FontGDI->TextMetric.tmAscent = (FT_MulFix(Face->size->metrics.ascender, YScale) + 32) >> 6; - FontGDI->TextMetric.tmDescent = (FT_MulFix(Face->size->metrics.descender, YScale) + 32) >> 6; - FontGDI->TextMetric.tmHeight = (FT_MulFix(Face->size->metrics.ascender, YScale) - - FT_MulFix(Face->size->metrics.descender, YScale)) >> 6; +#if 1 /* This (Wine) code doesn't seem to work correctly for us */ + FontGDI->TextMetric.tmAscent = (FT_MulFix(Face->ascender, YScale) + 32) >> 6; + FontGDI->TextMetric.tmDescent = (FT_MulFix(Face->descender, YScale) + 32) >> 6; + FontGDI->TextMetric.tmHeight = (FT_MulFix(Face->ascender, YScale) - + FT_MulFix(Face->descender, YScale)) >> 6; #else FontGDI->TextMetric.tmAscent = (Face->size->metrics.ascender + 32) >> 6; /* units above baseline */ FontGDI->TextMetric.tmDescent = (32 - Face->size->metrics.descender) >> 6; /* units below baseline */ @@ -715,7 +714,7 @@ FillTM(TEXTMETRICW *TM, FT_Face Face, TT_OS2 *pOS2, TT_HoriHeader *pHori) Descent = pOS2->usWinDescent; } -#if 0 /* This (Wine) code doesn't seem to work correctly for us, cmd issue */ +#if 1 /* This (Wine) code doesn't seem to work correctly for us, cmd issue */ TM->tmAscent = (FT_MulFix(Ascent, YScale) + 32) >> 6; TM->tmDescent = (FT_MulFix(Descent, YScale) + 32) >> 6; #else /* This (ros) code doesn't seem to work correctly for us for it miss 2-3 pixel draw of the font*/