Changeset 7296 for trunk/src/user32/static.cpp

Timestamp:

Nov 7, 2001, 8:19:09 PM (24 years ago)

Author:

sandervl

Message:

fix for SS_CENTERIMAGE style

File:

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

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.24 2001-05-11 08:39:44 sandervl Exp $ */
+/* $Id: static.cpp,v 1.25 2001-11-07 19:19:09 sandervl Exp $ */
 /*
  * Static control
@@ -722 +722 @@
                              hdc, hwnd );
     FillRect( hdc, &rc, hbrush );
+
     if (dwStyle & SS_CENTERIMAGE)
     {
       ICONINFO ii;
       BITMAP bmp;
+
+#if 0
+//TODO: fill with upper left pixel of icon
+      COLORREF color;
+
+      color = GetPixel(hMemDC, 0, 0);
+      hbrush = CreateSolidBrush(color);
+      FillRect( hdc, &rc, hbrush );
+      DeleteObject(hbrush);
+#endif
 
       if (!GetIconInfo(infoPtr->hIcon,&ii)) return;
@@ -738 +749 @@
       if (ii.hbmColor) DeleteObject(ii.hbmColor);
       if (ii.hbmMask) DeleteObject(ii.hbmMask);
-    } else if (infoPtr->hIcon) DrawIcon(hdc,rc.left,rc.top,infoPtr->hIcon);
+    } 
+    else 
+    if (infoPtr->hIcon) {
+        DrawIcon(hdc,rc.left,rc.top,infoPtr->hIcon);
+    }
 }
 
@@ -753 +768 @@
     hbrush = SendMessageA( GetParent(hwnd), WM_CTLCOLORSTATIC,
                              hdc, hwnd );
-    FillRect( hdc, &rc, hbrush );
 
     if (infoPtr->hIcon)
@@ -770 +784 @@
             SIZE szbm;
             SIZE szdc;
+            COLORREF color;
+
+            //SvL: Fill client area with pixel in upper left corner (SDK docs)
+            color = GetPixel(hMemDC, 0, 0);
+            hbrush = CreateSolidBrush(color);
+            FillRect( hdc, &rc, hbrush );
+            DeleteObject(hbrush);
 
             if(bm.bmWidth > rc.right - rc.left)
@@ -794 +815 @@
             }
             BitBlt(hdc, szdc.cx, szdc.cy, bm.bmWidth, bm.bmHeight, hMemDC,
-                szbm.cx, szbm.cy, SRCCOPY);
+                   szbm.cx, szbm.cy, SRCCOPY);
         }
         else
         {
+            FillRect( hdc, &rc, hbrush );
             BitBlt(hdc, 0, 0, bm.bmWidth, bm.bmHeight, hMemDC, 0, 0, SRCCOPY);
         }