gdiplus: If the font unit is not pixels scaling should not be applied.

Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdiplus: If the font unit is not pixels scaling should not be applied.
b7ca0bc0 · Dmitry Timoshkov · Alexandre Julliard · 1802ca5e · b7ca0bc0
Commit b7ca0bc0 authored Jan 23, 2020 by Dmitry Timoshkov Committed by Alexandre Julliard Jan 23, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

graphics.c dlls/gdiplus/graphics.c +6 -0

No files found.
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -2276,6 +2276,12 @@ static void get_font_hfont(GpGraphics *graphics, GDIPCONST GpFont *font,
                     (pt[1].X-pt[0].X)*(pt[1].X-pt[0].X));
    rel_height = sqrt((pt[2].Y-pt[0].Y)*(pt[2].Y-pt[0].Y)+
                      (pt[2].X-pt[0].X)*(pt[2].X-pt[0].X));
+    /* If the font unit is not pixels scaling should not be applied */
+    if (font->unit != UnitPixel && font->unit != UnitWorld)
+    {
+        rel_width /= graphics->scale;
+        rel_height /= graphics->scale;
+    }

    get_log_fontW(font, graphics, &lfw);
    lfw.lfHeight = -gdip_round(font_height * rel_height);