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

comctl32/button: Simplify focus rectangle calculation for drawing themed split buttons. 

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zhiyi Zhang 2021-11-04 14:52:03 +08:00 committed by Alexandre Julliard
parent 3d3914bca0
commit 5182c46cbe
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/comctl32/button.c
View File

@ -2861,7 +2861,7 @@ static void GB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused) static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, int state, UINT dtFlags, BOOL focused)
{ {
RECT rc, content_rect, push_rect, dropdown_rect; RECT rc, content_rect, push_rect, dropdown_rect, focus_rect;
NMCUSTOMDRAW nmcd; NMCUSTOMDRAW nmcd;
LRESULT cdrf; LRESULT cdrf;
HWND parent; HWND parent;
@ -2889,6 +2889,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
{ {
push_rect = rc; push_rect = rc;
DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, NULL); DrawThemeBackground(theme, hDC, BP_PUSHBUTTON, state, &rc, NULL);
GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &focus_rect);
} }
else else
{ {
@ -2909,6 +2910,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
/* The content rect should be the content area of the push button */ /* The content rect should be the content area of the push button */
GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &content_rect); GetThemeBackgroundContentRect(theme, hDC, BP_PUSHBUTTON, state, &push_rect, &content_rect);
focus_rect = content_rect;
} }
if (cdrf & CDRF_NOTIFYPOSTERASE) if (cdrf & CDRF_NOTIFYPOSTERASE)
@ -2951,18 +2953,7 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
} }
if (cdrf & CDRF_SKIPPOSTPAINT) return; if (cdrf & CDRF_SKIPPOSTPAINT) return;
if (focused) if (focused) DrawFocusRect(hDC, &focus_rect);
{
MARGINS margins;
GetThemeMargins(theme, hDC, BP_PUSHBUTTON, state, TMT_CONTENTMARGINS, NULL, &margins);
push_rect.left += margins.cxLeftWidth;
push_rect.top += margins.cyTopHeight;
push_rect.right -= margins.cxRightWidth;
push_rect.bottom -= margins.cyBottomHeight;
DrawFocusRect(hDC, &push_rect);
}
} }
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)