mirror of
https://github.com/reactos/reactos.git
synced 2025-05-02 21:24:09 +03:00
* Check is FontGDI->OriginalWeight > FontGDI->RequestWeight and if so, then return original weight. * Do not handle FontGDI->OriginalWeight as a boolean. Use 'FontGDI->OriginalWeight = FW_DONTCARE;'. CORE-17011
This commit is contained in:
parent
bbd6a57c0f
commit
e98bba2535
@ -1816,7 +1816,7 @@ IntGdiLoadFontsFromMemory(PGDI_LOAD_FONT pLoadFont,
|
||||
FontGDI->CharSet = ANSI_CHARSET;
|
||||
FontGDI->OriginalItalic = FALSE;
|
||||
FontGDI->RequestItalic = FALSE;
|
||||
FontGDI->OriginalWeight = FALSE;
|
||||
FontGDI->OriginalWeight = FW_DONTCARE;
|
||||
FontGDI->RequestWeight = FW_NORMAL;
|
||||
|
||||
IntLockFreeType();
|
||||
@ -2921,7 +2921,7 @@ FillTM(TEXTMETRICW *TM, PFONTGDI FontGDI,
|
||||
TM->tmMaxCharWidth = (FT_MulFix(Face->max_advance_width, XScale) + 32) >> 6;
|
||||
|
||||
if (FontGDI->OriginalWeight != FW_DONTCARE &&
|
||||
FontGDI->OriginalWeight != FW_NORMAL)
|
||||
FontGDI->OriginalWeight > FontGDI->RequestWeight)
|
||||
{
|
||||
TM->tmWeight = FontGDI->OriginalWeight;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user