Commit 19a77a8b authored by Zhiyi Zhang's avatar Zhiyi Zhang Committed by Alexandre Julliard

uxtheme: Use COLOR_BTNFACE to fill scroll bar background.

parent 0457376c
...@@ -888,8 +888,8 @@ static void test_themed_background(void) ...@@ -888,8 +888,8 @@ static void test_themed_background(void)
{WC_TREEVIEWA, 0, treeview_seq}, {WC_TREEVIEWA, 0, treeview_seq},
{UPDOWN_CLASSA, 0, empty_seq}, {UPDOWN_CLASSA, 0, empty_seq},
{WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, {WC_SCROLLBARA, 0, scrollbar_seq, TRUE},
{WC_SCROLLBARA, SBS_SIZEBOX, empty_seq, TRUE}, {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq},
{WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq, TRUE}, {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq},
}; };
uxtheme = LoadLibraryA("uxtheme.dll"); uxtheme = LoadLibraryA("uxtheme.dll");
......
...@@ -802,7 +802,6 @@ static void test_visual(void) ...@@ -802,7 +802,6 @@ static void test_visual(void)
hdc = GetDC(hwnd); hdc = GetDC(hwnd);
color = GetPixel(hdc, 5, 5); color = GetPixel(hdc, 5, 5);
todo_wine_if(bThemeActive)
ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color); ok(color == colors[1], "Expected color %#x, got %#x.\n", colors[1], color);
ReleaseDC(hwnd, hdc); ReleaseDC(hwnd, hdc);
......
...@@ -62,8 +62,9 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES ...@@ -62,8 +62,9 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES
else else
state = SZB_RIGHTALIGN; state = SZB_RIGHTALIGN;
if (IsThemeBackgroundPartiallyTransparent(theme, SBP_SIZEBOX, state)) /* Tests show that COLOR_BTNFACE is used instead of DrawThemeParentBackground() for drawing
DrawThemeParentBackground(hwnd, dc, NULL); * background */
FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE));
DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, rect, NULL); DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, rect, NULL);
} else { } else {
int uppertrackstate, lowertrackstate, thumbstate; int uppertrackstate, lowertrackstate, thumbstate;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment