Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 12:45:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[USER32]

Browse source 
- Simplify finding the icon size in IntDrawState
- As a bonus, it now works for black and white icons too

svn path=/trunk/; revision=53193
This commit is contained in:
Cameron Gutman 2011-08-12 10:07:16 +00:00
parent 19abe262d6
commit ef41655991
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/dll/win32/user32/windows/draw.c
View file

@ -1254,7 +1254,6 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
if(!cx || !cy)
{
SIZE s;
ICONINFO ici;
BITMAP bm;
switch(opcode)
@ -1270,14 +1269,8 @@ IntDrawState(HDC hdc, HBRUSH hbr, DRAWSTATEPROC func, LPARAM lp, WPARAM wp,
break;
case DST_ICON:
if(!GetIconInfo((HICON)lp, &ici))
if(!get_icon_size((HICON)lp, &s))
return FALSE;
if(!GetObjectW(ici.hbmColor, sizeof(bm), &bm))
return FALSE;
s.cx = bm.bmWidth;
s.cy = bm.bmHeight;
DeleteObject(ici.hbmMask);
DeleteObject(ici.hbmColor);
break;
case DST_BITMAP: