Author: greatlrd
Date: Tue Apr 10 22:52:24 2007
New Revision: 26306
URL: http://svn.reactos.org/svn/reactos?rev=26306&view=rev
Log:
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.
Modified:
trunk/reactos/subsystems/win32/win32k/objects/text.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/text.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Apr 10 22:52:24 2007
@@ -367,12 +367,11 @@
/* 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 @@
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*/
Author: greatlrd
Date: Tue Apr 10 21:06:59 2007
New Revision: 26305
URL: http://svn.reactos.org/svn/reactos?rev=26305&view=rev
Log:
darn rember me close all file before a commit, I did by mistake break the build fixed with this commit
Modified:
trunk/reactos/subsystems/win32/win32k/objects/text.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/text.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/text.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/text.c Tue Apr 10 21:06:59 2007
@@ -284,7 +284,7 @@
PFONT_ENTRY Entry;
PSECTION_OBJECT SectionObject;
ULONG ViewSize = 0;
- //FT_Fixed XScale, YScale;
+ FT_Fixed XScale, YScale;
/* Open the font file */