Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 19:05:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS] fix font extent.

Browse source 
CORE-13840
This commit is contained in:
Katayama Hirofumi MZ 2017-10-25 18:10:36 +09:00 • committed by Mark Jansen
parent b10dd06aa5
commit 85ae842105
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
win32ss/gdi/ntgdi/freetype.c
View file

@ -3570,6 +3570,7 @@ TextIntGetTextExtentPoint(PDC dc,
PMATRIX pmxWorldToDevice; PMATRIX pmxWorldToDevice;
LOGFONTW *plf; LOGFONTW *plf;
BOOL EmuBold, EmuItalic; BOOL EmuBold, EmuItalic;
LONG ascender, descender;
FontGDI = ObjToGDI(TextObj->Font, FONT); FontGDI = ObjToGDI(TextObj->Font, FONT);
@ -3676,13 +3677,12 @@ TextIntGetTextExtentPoint(PDC dc,
previous = glyph_index; previous = glyph_index;
String++; String++;
} }
ascender = (face->size->metrics.ascender + 32) >> 6; /* Units above baseline */
descender = (32 - face->size->metrics.descender) >> 6; /* Units below baseline */
IntUnLockFreeType; IntUnLockFreeType;
Size->cx = (TotalWidth + 32) >> 6; Size->cx = (TotalWidth + 32) >> 6;
Size->cy = (plf->lfHeight == 0 ? Size->cy = ascender + descender;
dc->ppdev->devinfo.lfDefaultFont.lfHeight :
abs(plf->lfHeight));
Size->cy = EngMulDiv(Size->cy, dc->ppdev->gdiinfo.ulLogPixelsY, 72);
return TRUE; return TRUE;
} }