Huw Davies : user32: Don' t fill the background when drawing the scroll arrows.
Alexandre Julliard
julliard at winehq.org
Wed Mar 29 15:02:51 CDT 2017
Module: wine
Branch: master
Commit: bd785a5ac0de154099dc9be959d23b8500132c84
URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd785a5ac0de154099dc9be959d23b8500132c84
Author: Huw Davies <huw at codeweavers.com>
Date: Wed Mar 29 10:42:05 2017 +0100
user32: Don't fill the background when drawing the scroll arrows.
This is done, in the correct colour, in MENU_DrawPopupMenu().
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/menu.c | 6 ------
1 file changed, 6 deletions(-)
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 28222dc..58bfe68 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -1339,7 +1339,6 @@ MENU_DrawScrollArrows(const POPUPMENU *lppop, HDC hdc)
HBITMAP hOrigBitmap;
UINT arrow_bitmap_width, arrow_bitmap_height;
BITMAP bmp;
- RECT rect;
GetObjectW(get_down_arrow_bitmap(), sizeof(bmp), &bmp);
arrow_bitmap_width = bmp.bmWidth;
@@ -1350,13 +1349,8 @@ MENU_DrawScrollArrows(const POPUPMENU *lppop, HDC hdc)
hOrigBitmap = SelectObject(hdcMem, get_up_arrow_bitmap());
else
hOrigBitmap = SelectObject(hdcMem, get_up_arrow_inactive_bitmap());
- SetRect(&rect, 0, 0, lppop->Width, arrow_bitmap_height);
- FillRect(hdc, &rect, GetSysColorBrush(COLOR_MENU));
BitBlt(hdc, (lppop->Width - arrow_bitmap_width) / 2, 0,
arrow_bitmap_width, arrow_bitmap_height, hdcMem, 0, 0, SRCCOPY);
- rect.top = lppop->Height - arrow_bitmap_height;
- rect.bottom = lppop->Height;
- FillRect(hdc, &rect, GetSysColorBrush(COLOR_MENU));
if (lppop->nScrollPos < lppop->nTotalHeight - (MENU_GetMaxPopupHeight(lppop) - 2 * arrow_bitmap_height))
SelectObject(hdcMem, get_down_arrow_bitmap());
else
More information about the wine-cvs
mailing list