Commit 04d53626 authored by Shawn M. Chapla's avatar Shawn M. Chapla Committed by Alexandre Julliard

gdiplus: Set font emSize to height minus internal leading.

parent bfc84040
...@@ -219,7 +219,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc, ...@@ -219,7 +219,7 @@ GpStatus WINGDIPAPI GdipCreateFontFromLogfontW(HDC hdc,
if (!*font) return OutOfMemory; if (!*font) return OutOfMemory;
(*font)->unit = UnitWorld; (*font)->unit = UnitWorld;
(*font)->emSize = otm.otmTextMetrics.tmAscent; (*font)->emSize = otm.otmTextMetrics.tmHeight - otm.otmTextMetrics.tmInternalLeading;
(*font)->otm = otm; (*font)->otm = otm;
stat = GdipCreateFontFamilyFromName(facename, NULL, &(*font)->family); stat = GdipCreateFontFamilyFromName(facename, NULL, &(*font)->family);
......
...@@ -344,7 +344,7 @@ static void test_logfont(void) ...@@ -344,7 +344,7 @@ static void test_logfont(void)
stat = GdipGetFontSize(font, &rval); stat = GdipGetFontSize(font, &rval);
expect(Ok, stat); expect(Ok, stat);
todo_wine expectf(test_sizes[i].expected, rval); expectf(test_sizes[i].expected, rval);
GdipDeleteFont(font); GdipDeleteFont(font);
font = NULL; font = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment