ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/button: Do not restore command link font after themed painting. 

Fix button test failures when theming is on.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2021-10-01 11:29:55 +08:00 committed by Alexandre Julliard
parent 84e0eac1f9
commit 887e1bcfc3
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/comctl32/button.c
View File

@ -2982,12 +2982,13 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)
{ {
HFONT old_font = infoPtr->font ? SelectObject(hDC, infoPtr->font) : NULL;
NMCUSTOMDRAW nmcd; NMCUSTOMDRAW nmcd;
LRESULT cdrf; LRESULT cdrf;
HWND parent; HWND parent;
RECT rc; RECT rc;
if (infoPtr->font) SelectObject(hDC, infoPtr->font);
GetClientRect(infoPtr->hwnd, &rc); GetClientRect(infoPtr->hwnd, &rc);
init_custom_draw(&nmcd, infoPtr, hDC, &rc); init_custom_draw(&nmcd, infoPtr, hDC, &rc);
@ -2996,7 +2997,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
/* Send erase notifications */ /* Send erase notifications */
cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd);
if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; if (cdrf & CDRF_SKIPDEFAULT) return;
if (IsThemeBackgroundPartiallyTransparent(theme, BP_COMMANDLINK, state)) if (IsThemeBackgroundPartiallyTransparent(theme, BP_COMMANDLINK, state))
DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL); DrawThemeParentBackground(infoPtr->hwnd, hDC, NULL);
@ -3011,7 +3012,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
/* Send paint notifications */ /* Send paint notifications */
nmcd.dwDrawStage = CDDS_PREPAINT; nmcd.dwDrawStage = CDDS_PREPAINT;
cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); cdrf = SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd);
if (cdrf & CDRF_SKIPDEFAULT) goto cleanup; if (cdrf & CDRF_SKIPDEFAULT) return;
if (!(cdrf & CDRF_DOERASE)) if (!(cdrf & CDRF_DOERASE))
{ {
@ -3083,7 +3084,7 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
nmcd.dwDrawStage = CDDS_POSTPAINT; nmcd.dwDrawStage = CDDS_POSTPAINT;
SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd); SendMessageW(parent, WM_NOTIFY, nmcd.hdr.idFrom, (LPARAM)&nmcd);
} }
if (cdrf & CDRF_SKIPPOSTPAINT) goto cleanup; if (cdrf & CDRF_SKIPPOSTPAINT) return;
if (focused) if (focused)
{ {
@ -3098,9 +3099,6 @@ static void CL_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
rc.bottom -= margins.cyBottomHeight; rc.bottom -= margins.cyBottomHeight;
DrawFocusRect(hDC, &rc); DrawFocusRect(hDC, &rc);
} }
cleanup:
if (old_font) SelectObject(hDC, old_font);
} }
void BUTTON_Register(void) void BUTTON_Register(void)