Skip to content

W
wine-winehq
Commit 27492598 authored by Stephane Lussier's avatar Stephane Lussier Committed by Alexandre Julliard
Browse files
Options

In ImageList_Draw when drawing the bitmap with the transparent flag

set, background color/foreground color should be set to white/black, when doing bitblt operation with the bitmap mask.
parent 56a86447
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
dlls/comctl32/imagelist.c
View file @ 27492598
......@@ -188,6 +188,7 @@ IMAGELIST_InternalDrawMask(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
HBRUSH hBrush, hOldBrush;
HBITMAP hOldBitmapImage, hOldBitmapMask;
HIMAGELIST himlLocal = pimldp->himl;
COLORREF oldBkColor, oldFgColor;
bUseCustomBackground = (himlLocal->clrBk != CLR_NONE);
bBlendFlag = (pimldp->fStyle & ILD_BLEND50 )
......@@ -220,6 +221,12 @@ IMAGELIST_InternalDrawMask(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
|| ((pimldp->fStyle & ILD_IMAGE) && bUseCustomBackground)
|| bBlendFlag)
{
/* to obtain a transparent look, background color should be set
to white and foreground color to black when blting the
monochrome mask. */
oldBkColor = SetBkColor(pimldp->hdcDst, RGB(0xff, 0xff, 0xff));
oldFgColor = SetTextColor(pimldp->hdcDst, RGB(0, 0, 0));
BitBlt(pimldp->hdcDst,
pimldp->x, pimldp->y, cx, cy,
hMaskDC,
......@@ -231,6 +238,9 @@ IMAGELIST_InternalDrawMask(IMAGELISTDRAWPARAMS *pimldp, INT cx, INT cy)
hImageDC,
himlLocal->cx * pimldp->i, 0,
SRCPAINT);
SetBkColor(pimldp->hdcDst, oldBkColor);
SetTextColor(pimldp->hdcDst, oldFgColor);
}
/* Draw the image when no Background is specified
*/
......
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