comctl32/toolbar: Don't use pattern brushes to draw checked background.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53049Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>

comctl32/toolbar: Don't use pattern brushes to draw checked background.
9b5df952 · Zhiyi Zhang · Alexandre Julliard · 7f491491 · 9b5df952 · 9b5df952
Commit 9b5df952 authored May 30, 2022 by Zhiyi Zhang Committed by Alexandre Julliard Jun 21, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

toolbar.c dlls/comctl32/tests/toolbar.c +0 -1

toolbar.c dlls/comctl32/toolbar.c +1 -1

No files found.
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -2666,7 +2666,6 @@ static void test_visual(void)
    toolbar_dc = GetDC(toolbar);
    color = GetPixel(toolbar_dc, 5, 5);
    if (is_theme_active)
-        todo_wine
        ok(color != RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color);
    else
        ok(color == RGB(0xff, 0, 0), "Unexpected color %#lx.\n", color);

--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -1042,7 +1042,7 @@ TOOLBAR_DrawButton (const TOOLBAR_INFO *infoPtr, TBUTTON_INFO *btnPtr, HDC hdc, 
        (btnPtr->fsState & (TBSTATE_PRESSED | TBSTATE_CHECKED)))
        OffsetRect(&rcText, 1, 1);

-    if (!(tbcd.nmcd.uItemState & CDIS_HOT) && 
+    if (!theme && !(tbcd.nmcd.uItemState & CDIS_HOT) &&
        ((tbcd.nmcd.uItemState & CDIS_CHECKED) || (tbcd.nmcd.uItemState & CDIS_INDETERMINATE)))
        TOOLBAR_DrawPattern (&rc, &tbcd);