[ros-diffs] [jgardou] 63933: [WIN32K] - Enable commented freetype call: set font face size and coordinate transformation matrix Patch by Huw Campbell, reviewed by a gazillion of people. CORE-4657 #resolve #com...

[jgardou]

Author: jgardou
Date: Sun Aug 24 13:28:33 2014
New Revision: 63933

URL: http://svn.reactos.org/svn/reactos?rev=63933&view=rev
Log:
[WIN32K]
 - Enable commented freetype call: set font face size and coordinate 
transformation matrix
Patch by Huw Campbell, reviewed by a gazillion of people.
CORE-4657 #resolve #comment committed in r63933, a million thanks

Modified:
    trunk/reactos/win32ss/gdi/ntgdi/freetype.c

Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype.c?rev=63933&r1=63932&r2=63933&view=diff
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/freetype.c  [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c  [iso-8859-1] Sun Aug 24 
13:28:33 2014
@@ -1600,12 +1600,12 @@
         }
     }
 
-//  FT_Set_Pixel_Sizes(ft_face,
-//                     TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth,
+    FT_Set_Pixel_Sizes(ft_face,
+                       TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfWidth,
     /* FIXME: Should set character height if neg */
-//                     (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight 
== 0 ?
-//                      dc->ppdev->devinfo.lfDefaultFont.lfHeight : 
abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
-//    FtSetCoordinateTransform(face, DC_pmxWorldToDevice(dc));
+                       (TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight 
== 0 ?
+                        dc->ppdev->devinfo.lfDefaultFont.lfHeight : 
abs(TextObj->logfont.elfEnumLogfontEx.elfLogFont.lfHeight)));
+    FtSetCoordinateTransform(ft_face, DC_pmxWorldToDevice(dc));
 
     TEXTOBJ_UnlockText(TextObj);
 
@@ -3674,6 +3674,7 @@
         }
         else
         {
+            // FIXME this should probably be a matrix transform with TextTop 
as well.
             Scale = pdcattr->mxWorldToDevice.efM11;
             if (_FLOATOBJ_Equal0(&Scale))
                 FLOATOBJ_Set1(&Scale);