uxtheme: Support DTT_FONTPROP for DrawThemeTextEx().
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
a18df3a412
commit
300ecff145
|
@ -1660,6 +1660,7 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId
|
||||||
COLORREF textColor;
|
COLORREF textColor;
|
||||||
COLORREF oldTextColor;
|
COLORREF oldTextColor;
|
||||||
int oldBkMode;
|
int oldBkMode;
|
||||||
|
int fontProp;
|
||||||
|
|
||||||
TRACE("%p %p %d %d %s:%d 0x%08x %p %p\n", hTheme, hdc, iPartId, iStateId,
|
TRACE("%p %p %d %d %s:%d 0x%08x %p %p\n", hTheme, hdc, iPartId, iStateId,
|
||||||
debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options);
|
debugstr_wn(pszText, iCharCount), iCharCount, flags, rect, options);
|
||||||
|
@ -1667,10 +1668,15 @@ HRESULT WINAPI DrawThemeTextEx(HTHEME hTheme, HDC hdc, int iPartId, int iStateId
|
||||||
if(!hTheme)
|
if(!hTheme)
|
||||||
return E_HANDLE;
|
return E_HANDLE;
|
||||||
|
|
||||||
if (options->dwFlags & ~DTT_TEXTCOLOR)
|
if (options->dwFlags & ~(DTT_TEXTCOLOR | DTT_FONTPROP))
|
||||||
FIXME("unsupported flags 0x%08x\n", options->dwFlags);
|
FIXME("unsupported flags 0x%08x\n", options->dwFlags);
|
||||||
|
|
||||||
hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, TMT_FONT, &logfont);
|
if (options->dwFlags & DTT_FONTPROP)
|
||||||
|
fontProp = options->iFontPropId;
|
||||||
|
else
|
||||||
|
fontProp = TMT_FONT;
|
||||||
|
|
||||||
|
hr = GetThemeFont(hTheme, hdc, iPartId, iStateId, fontProp, &logfont);
|
||||||
if(SUCCEEDED(hr)) {
|
if(SUCCEEDED(hr)) {
|
||||||
hFont = CreateFontIndirectW(&logfont);
|
hFont = CreateFontIndirectW(&logfont);
|
||||||
if(!hFont)
|
if(!hFont)
|
||||||
|
|
Loading…
Reference in New Issue