Changeset 2160 for trunk/src/user32/uitools.cpp

Timestamp:

Dec 20, 1999, 5:45:18 PM (26 years ago)

Author:

cbratschi

Message:

some icon bug fixes

File:

• trunk/src/user32/uitools.cpp (modified) (6 diffs)

trunk/src/user32/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.18 1999-12-16 16:53:57 cbratschi Exp $ */
+/* $Id: uitools.cpp,v 1.19 1999-12-20 16:45:16 cbratschi Exp $ */
 /*
  * User Interface Functions
@@ -1650 +1650 @@
 
   if (!GetIconInfo(hIcon,&ii)) return FALSE;
-  GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
   oldFg = SetTextColor(hDC,RGB(0,0,0));
   oldBg = SetBkColor(hDC,RGB(255,255,255));
   hMemDC = CreateCompatibleDC(hDC);
   oldBmp = SelectObject(hMemDC,ii.hbmMask);
-  BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight,hMemDC,0,0,SRCAND);
-  SelectObject(hMemDC,ii.hbmColor);
-  BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight,hMemDC,0,0,SRCPAINT);
-  SelectObject(hMemDC,ii.hbmMask);
-  BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight,hMemDC,0,bmp.bmHeight,SRCINVERT);
+  if (ii.hbmColor)
+  {
+    GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+    BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight,hMemDC,0,0,SRCAND);
+    SelectObject(hMemDC,ii.hbmColor);
+    BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight,hMemDC,0,0,SRCINVERT);
+  } else
+  {
+    GetObjectA(ii.hbmMask,sizeof(BITMAP),(LPVOID)&bmp);
+    BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight/2,hMemDC,0,0,SRCAND);
+    BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight/2,hMemDC,0,bmp.bmHeight/2,SRCINVERT);
+  }
   SelectObject(hMemDC,oldBmp);
   DeleteObject(hMemDC);
+  if (ii.hbmColor) DeleteObject(ii.hbmColor);
+  if (ii.hbmMask) DeleteObject(ii.hbmMask);
   SetTextColor(hDC,oldFg);
   SetBkColor(hDC,oldBg);
@@ -1694 +1702 @@
 
   if (!GetIconInfo(hIcon,&ii)) return FALSE;
-  GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+  if (ii.hbmColor)
+    GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+  else
+    GetObjectA(ii.hbmMask,sizeof(BITMAP),(LPVOID)&bmp);
 
   /* Calculate the size of the destination image.  */
-  if (cxWidth == 0)
+  if (diFlags & DI_DEFAULTSIZE)
   {
-    if (diFlags & DI_DEFAULTSIZE)
-      cxWidth = GetSystemMetrics(SM_CXICON);
-    else
-      cxWidth = bmp.bmWidth;
-  }
-  if (cyWidth == 0)
+    cxWidth = GetSystemMetrics(SM_CXICON);
+    cyWidth = GetSystemMetrics(SM_CYICON);
+  } else if (cxWidth == 0)
   {
-    if (diFlags & DI_DEFAULTSIZE)
-      cyWidth = GetSystemMetrics(SM_CYICON);
-    else
-      cyWidth = bmp.bmHeight;
+    cxWidth = bmp.bmWidth;
+  } else if (cyWidth == 0)
+  {
+    cyWidth = ii.hbmColor ? bmp.bmHeight:bmp.bmHeight/2;
   }
 
@@ -1729 +1737 @@
     oldBmp = SelectObject(hMemDC,ii.hbmMask);
     oldStretchMode = SetStretchBltMode(hBmpDC,STRETCH_DELETESCANS);
-    StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCAND);
-    SelectObject(hMemDC,ii.hbmColor);
-    StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCPAINT);
-    SelectObject(hMemDC,ii.hbmMask);
-    StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,bmp.bmHeight,bmp.bmWidth,bmp.bmHeight,SRCINVERT);
+    if (ii.hbmColor)
+    {
+      if (diFlags & DI_MASK)
+        StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCAND);
+      if (diFlags & DI_IMAGE)
+      {
+        SelectObject(hMemDC,ii.hbmColor);
+        StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCINVERT);
+      }
+    } else if (diFlags & DI_MASK)
+    {
+      StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight/2,SRCAND);
+      StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,bmp.bmHeight/2,bmp.bmWidth,bmp.bmHeight/2,SRCINVERT);
+    }
     BitBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hBmpDC,0,0,SRCCOPY);
     SelectObject(hMemDC,oldBmp);
@@ -1750 +1767 @@
     oldBmp = SelectObject(hMemDC,ii.hbmMask);
     oldStretchMode = SetStretchBltMode(hdc,STRETCH_DELETESCANS);
-    StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCAND);
-    SelectObject(hMemDC,ii.hbmColor);
-    StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCPAINT);
-    SelectObject(hMemDC,ii.hbmMask);
-    StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,bmp.bmHeight,bmp.bmWidth,bmp.bmHeight,SRCINVERT);
+    if (ii.hbmColor)
+    {
+      if (diFlags & DI_MASK)
+        StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCAND);
+      if (diFlags & DI_IMAGE)
+      {
+        SelectObject(hMemDC,ii.hbmColor);
+        StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCINVERT);
+      }
+    } else if (diFlags & DI_MASK)
+    {
+      StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCAND);
+      StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,bmp.bmHeight/2,bmp.bmWidth,bmp.bmHeight/2,SRCINVERT);
+    }
     SelectObject(hMemDC,oldBmp);
     DeleteObject(hMemDC);
@@ -1761 +1787 @@
     SetStretchBltMode(hdc,oldStretchMode);
   }
+  if (ii.hbmColor) DeleteObject(ii.hbmColor);
+  if (ii.hbmMask) DeleteObject(ii.hbmMask);
 
   return TRUE;