comctl32/button: Use themed painting when possible for handling WM_SETTEXT.

Fix an issue that themed buttons are drawn unthemed after receiving a WM_SETTEXT message. Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/button: Use themed painting when possible for handling WM_SETTEXT.
3c81ca83 · Zhiyi Zhang · Alexandre Julliard · 9dd0c07d · 3c81ca83 · 3c81ca83
Commit 3c81ca83 authored Mar 03, 2021 by Zhiyi Zhang Committed by Alexandre Julliard Mar 03, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

button.c dlls/comctl32/button.c +2 -0

button.c dlls/comctl32/tests/button.c +1 -2

No files found.
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/button.c
@@ -743,6 +743,8 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
        DefWindowProcW( hWnd, WM_SETTEXT, wParam, lParam );
        if (btn_type == BS_GROUPBOX) /* Yes, only for BS_GROUPBOX */
            InvalidateRect( hWnd, NULL, TRUE );
+        else if (GetWindowTheme( hWnd ))
+            RedrawWindow( hWnd, NULL, NULL, RDW_INVALIDATE | RDW_UPDATENOW );
        else
            paint_button( infoPtr, btn_type, ODA_DRAWENTIRE );
        return 1; /* success. FIXME: check text length */

--- a/dlls/comctl32/tests/button.c
+++ b/dlls/comctl32/tests/button.c
@@ -2359,8 +2359,7 @@ static void test_visual(void)
        SelectObject(mem_dc2, mem_bitmap2);
        BitBlt(mem_dc2, 0, 0, width, height, button_dc, 0, 0, SRCCOPY);
-        todo_wine_if(type == BS_PUSHBOX || (is_theme_active && !(type == BS_OWNERDRAW
+        todo_wine_if(type == BS_PUSHBOX || (is_theme_active && type == BS_GROUPBOX))
-                || type == BS_COMMANDLINK || type == BS_DEFCOMMANDLINK)))
        ok(equal_dc(mem_dc1, mem_dc2, width, height), "Type %#x: Expected content unchanged.\n", type);
        DeleteObject(mem_bitmap2);