If a color bitmap is provided, store bitmap information from it
instead of the mask bitmap one.
This commit is contained in:
parent
68b8a4ab69
commit
24a3ae0601
|
@ -1840,11 +1840,22 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
|
|||
info->ptHotSpot.y = iconinfo->yHotspot;
|
||||
}
|
||||
|
||||
if (iconinfo->hbmColor)
|
||||
{
|
||||
info->nWidth = bmpXor.bmWidth;
|
||||
info->nHeight = bmpXor.bmHeight;
|
||||
info->nWidthBytes = bmpXor.bmWidthBytes;
|
||||
info->bPlanes = bmpXor.bmPlanes;
|
||||
info->bBitsPerPixel = bmpXor.bmBitsPixel;
|
||||
}
|
||||
else
|
||||
{
|
||||
info->nWidth = bmpAnd.bmWidth;
|
||||
info->nHeight = iconinfo->hbmColor ? bmpAnd.bmHeight : (bmpAnd.bmHeight / 2);
|
||||
info->nHeight = bmpAnd.bmHeight / 2;
|
||||
info->nWidthBytes = bmpAnd.bmWidthBytes;
|
||||
info->bPlanes = bmpAnd.bmPlanes;
|
||||
info->bBitsPerPixel = bmpAnd.bmBitsPixel;
|
||||
}
|
||||
|
||||
/* Transfer the bitmap bits to the CURSORICONINFO structure */
|
||||
|
||||
|
|
Loading…
Reference in New Issue