gdi32: Fix synthetic bold outline text metrics.

Without this fix, synthetic tmAveCharWidth value unintentionally affects SCALE_X calculation. Signed-off-by: Akihiro Sagawa <sagawa.aki@gmail.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdi32: Fix synthetic bold outline text metrics.
68f9fb55 · Akihiro Sagawa · Alexandre Julliard · 1bd9cb34 · 68f9fb55
Commit 68f9fb55 authored Feb 18, 2018 by Akihiro Sagawa Committed by Alexandre Julliard Feb 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

freetype.c dlls/gdi32/freetype.c +6 -4

No files found.
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -7554,6 +7554,11 @@ static void scale_font_metrics(const GdiFont *font, LPTEXTMETRICW ptm)
    SCALE_Y(ptm->tmExternalLeading);
    SCALE_Y(ptm->tmOverhang);

+    if(FT_IS_SCALABLE(font->ft_face) && font->fake_bold)
+    {
+        ptm->tmAveCharWidth++;
+        ptm->tmMaxCharWidth++;
+    }
    SCALE_X(ptm->tmAveCharWidth);
    SCALE_X(ptm->tmMaxCharWidth);

@@ -7778,11 +7783,8 @@ static BOOL get_outline_text_metrics(GdiFont *font)
    }
    TM.tmMaxCharWidth = SCALE_X(ft_face->bbox.xMax - ft_face->bbox.xMin);
    TM.tmWeight = FW_REGULAR;
-    if (font->fake_bold) {
-        TM.tmAveCharWidth++;
-        TM.tmMaxCharWidth++;
+    if (font->fake_bold)
        TM.tmWeight = FW_BOLD;
-    }
    else
    {
        if (ft_face->style_flags & FT_STYLE_FLAG_BOLD)