ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If a color bitmap is provided, store bitmap information from it

Browse Source 
instead of the mask bitmap one.
This commit is contained in:
Christian Costa 2005-11-09 10:57:57 +00:00 committed by Alexandre Julliard
parent 68b8a4ab69
commit 24a3ae0601
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/user/cursoricon.c
View File

@ -1831,20 +1831,31 @@ HICON WINAPI CreateIconIndirect(PICONINFO iconinfo)
/* If we are creating an icon, the hotspot is unused */ /* If we are creating an icon, the hotspot is unused */
if (iconinfo->fIcon) if (iconinfo->fIcon)
{ {
info->ptHotSpot.x = ICON_HOTSPOT; info->ptHotSpot.x = ICON_HOTSPOT;
info->ptHotSpot.y = ICON_HOTSPOT; info->ptHotSpot.y = ICON_HOTSPOT;
} }
else else
{ {
info->ptHotSpot.x = iconinfo->xHotspot; info->ptHotSpot.x = iconinfo->xHotspot;
info->ptHotSpot.y = iconinfo->yHotspot; info->ptHotSpot.y = iconinfo->yHotspot;
} }
info->nWidth = bmpAnd.bmWidth; if (iconinfo->hbmColor)
info->nHeight = iconinfo->hbmColor ? bmpAnd.bmHeight : (bmpAnd.bmHeight / 2); {
info->nWidthBytes = bmpAnd.bmWidthBytes; info->nWidth = bmpXor.bmWidth;
info->bPlanes = bmpAnd.bmPlanes; info->nHeight = bmpXor.bmHeight;
info->bBitsPerPixel = bmpAnd.bmBitsPixel; info->nWidthBytes = bmpXor.bmWidthBytes;
info->bPlanes = bmpXor.bmPlanes;
info->bBitsPerPixel = bmpXor.bmBitsPixel;
}
else
{
info->nWidth = bmpAnd.bmWidth;
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 */ /* Transfer the bitmap bits to the CURSORICONINFO structure */