Zhiyi Zhang : comctl32/button: Correctly place parts for themed split buttons.
Alexandre Julliard
julliard at winehq.org
Fri Nov 5 17:15:52 CDT 2021
Module: wine
Branch: master
Commit: 595f5c59ec6f72c935eddf6ae5dc3b3b2314edf0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=595f5c59ec6f72c935eddf6ae5dc3b3b2314edf0
Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date: Fri Nov 5 14:35:05 2021 +0800
comctl32/button: Correctly place parts for themed split buttons.
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/comctl32/button.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index 7b617a199b0..19febd8b6ac 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -2917,7 +2917,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)
{
- RECT rc, content_rect, push_rect, dropdown_rect, focus_rect;
+ RECT rc, content_rect, push_rect, dropdown_rect, focus_rect, label_rect, image_rect, text_rect;
NMCUSTOMDRAW nmcd;
LRESULT cdrf;
HWND parent;
@@ -2984,13 +2984,12 @@ static void SB_ThemedPaint(HTHEME theme, const BUTTON_INFO *infoPtr, HDC hDC, in
{
COLORREF old_color, color;
INT old_bk_mode;
- WCHAR *text;
- if ((text = get_button_text(infoPtr)))
- {
- DrawThemeText(theme, hDC, BP_PUSHBUTTON, state, text, lstrlenW(text), dtFlags, 0, &content_rect);
- heap_free(text);
- }
+ label_rect = content_rect;
+ dtFlags = BUTTON_CalcLayoutRects(infoPtr, hDC, &label_rect, &image_rect, &text_rect);
+ if (dtFlags != (UINT)-1L)
+ BUTTON_DrawThemedLabel(infoPtr, hDC, dtFlags, &image_rect, &text_rect, theme,
+ BP_PUSHBUTTON, state);
GetThemeColor(theme, BP_PUSHBUTTON, state, TMT_TEXTCOLOR, &color);
old_bk_mode = SetBkMode(hDC, TRANSPARENT);
More information about the wine-cvs
mailing list