Module: wine Branch: master Commit: 08d9f9b60b4787fd020c867c323d2c401b6e8e23 URL: https://gitlab.winehq.org/wine/wine/-/commit/08d9f9b60b4787fd020c867c323d2c4...
Author: David Kahurani k.kahurani@gmail.com Date: Tue Aug 1 12:23:26 2023 +0300
gdiplus: Use get_log_fontW in GdipGetLogFontW.
Signed-off-by: David Kahurani k.kahurani@gmail.com
---
dlls/gdiplus/font.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index 316f65d84cf..7bd60750e6d 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -480,24 +480,15 @@ GpStatus WINGDIPAPI GdipGetLogFontW(GpFont *font, GpGraphics *graphics, LOGFONTW
GdipMultiplyMatrix(&matrix, &graphics->gdi_transform, MatrixOrderAppend); transform_properties(graphics, &matrix, FALSE, NULL, &rel_height, &angle); + get_log_fontW(font, graphics, lf); + lf->lfHeight = -gdip_round(height * rel_height); - lf->lfWidth = 0; lf->lfEscapement = lf->lfOrientation = gdip_round((angle / M_PI) * 1800.0); if (lf->lfEscapement < 0) { lf->lfEscapement += 3600; lf->lfOrientation += 3600; } - lf->lfWeight = font->otm.otmTextMetrics.tmWeight; - lf->lfItalic = font->otm.otmTextMetrics.tmItalic ? 1 : 0; - lf->lfUnderline = font->otm.otmTextMetrics.tmUnderlined ? 1 : 0; - lf->lfStrikeOut = font->otm.otmTextMetrics.tmStruckOut ? 1 : 0; - lf->lfCharSet = font->otm.otmTextMetrics.tmCharSet; - lf->lfOutPrecision = OUT_DEFAULT_PRECIS; - lf->lfClipPrecision = CLIP_DEFAULT_PRECIS; - lf->lfQuality = DEFAULT_QUALITY; - lf->lfPitchAndFamily = 0; - lstrcpyW(lf->lfFaceName, font->family->FamilyName);
TRACE("=> %s,%ld\n", debugstr_w(lf->lfFaceName), lf->lfHeight);