Changeset 992 for trunk/src/user32/button.cpp

Timestamp:

Sep 20, 1999, 9:17:58 PM (26 years ago)

Author:

sandervl

Message:

Fixes for incorrect background color for button, group & static text

File:

• trunk/src/user32/button.cpp (modified) (11 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.2 1999-09-20 16:19:54 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.3 1999-09-20 19:17:57 sandervl Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -612 +612 @@
      */
     BUTTON_DrawPushButton(hwnd,
-                          hDC,
-                          action,
-                          bHighLighted);
+                          hDC,
+                          action,
+                          bHighLighted);
 }
 
@@ -649 +649 @@
     {
         Rectangle(hDC, rc.left, rc.top, rc.right, rc.bottom);
-        InflateRect( &rc, -1, -1 );
+        InflateRect( &rc, -1, -1 );
     }
 
@@ -693 +693 @@
             /* don't write gray text on gray background */
             PaintGrayOnGray( hDC,infoPtr->hFont,&rc,text,
-                               DT_CENTER | DT_VCENTER );
+                               DT_CENTER | DT_VCENTER );
         else
         {
@@ -702 +702 @@
                          DT_SINGLELINE | DT_CENTER | DT_VCENTER );
             /* do we have the focus?
-             * Win9x draws focus last with a size prop. to the button
-             */
+             * Win9x draws focus last with a size prop. to the button
+             */
         }
         free(text);
     }
     if ( ((dwStyle & BS_ICON) || (dwStyle & BS_BITMAP) ) &&
-         (infoPtr->hImage != NULL) )
-    {
-        int yOffset, xOffset;
-        int imageWidth, imageHeight;
-
-        /*
-         * We extract the size of the image from the handle.
-         */
-        if (dwStyle & BS_ICON)
-        {
-            ICONINFO iconInfo;
-            BITMAP   bm;
-
-            GetIconInfo((HICON)infoPtr->hImage, &iconInfo);
-            GetObjectA (iconInfo.hbmColor, sizeof(BITMAP), &bm);
-
-            imageWidth  = bm.bmWidth;
-            imageHeight = bm.bmHeight;
+         (infoPtr->hImage != NULL) )
+    {
+        int yOffset, xOffset;
+        int imageWidth, imageHeight;
+
+        /*
+         * We extract the size of the image from the handle.
+         */
+        if (dwStyle & BS_ICON)
+        {
+            ICONINFO iconInfo;
+            BITMAP   bm;
+
+            GetIconInfo((HICON)infoPtr->hImage, &iconInfo);
+            GetObjectA (iconInfo.hbmColor, sizeof(BITMAP), &bm);
+        
+            imageWidth  = bm.bmWidth;
+            imageHeight = bm.bmHeight;
 
             DeleteObject(iconInfo.hbmColor);
             DeleteObject(iconInfo.hbmMask);
 
-        }
-        else
-        {
-            BITMAP   bm;
-
-            GetObjectA (infoPtr->hImage, sizeof(BITMAP), &bm);
-
-            imageWidth  = bm.bmWidth;
-            imageHeight = bm.bmHeight;
-        }
-
-        /* Center the bitmap */
-        xOffset = (((rc.right - rc.left) - 2*xBorderOffset) - imageWidth ) / 2;
-        yOffset = (((rc.bottom - rc.top) - 2*yBorderOffset) - imageHeight) / 2;
-
-        /* If the image is too big for the button then create a region*/
+        }
+        else
+        {
+            BITMAP   bm;
+
+            GetObjectA (infoPtr->hImage, sizeof(BITMAP), &bm);
+        
+            imageWidth  = bm.bmWidth;
+            imageHeight = bm.bmHeight;
+        }
+
+        /* Center the bitmap */
+        xOffset = (((rc.right - rc.left) - 2*xBorderOffset) - imageWidth ) / 2;
+        yOffset = (((rc.bottom - rc.top) - 2*yBorderOffset) - imageHeight) / 2;
+
+        /* If the image is too big for the button then create a region*/
         if(xOffset < 0 || yOffset < 0)
-        {
+        {
             HRGN hBitmapRgn = NULL;
             hBitmapRgn = CreateRectRgn(
@@ -754 +754 @@
             SelectClipRgn(hDC, hBitmapRgn);
             DeleteObject(hBitmapRgn);
-        }
-
-        /* Let minimum 1 space from border */
-        xOffset++, yOffset++;
-
-        /*
-         * Draw the image now.
-         */
-        if (dwStyle & BS_ICON)
+        }
+
+        /* Let minimum 1 space from border */
+        xOffset++, yOffset++;
+
+        /*
+         * Draw the image now.
+         */
+        if (dwStyle & BS_ICON)
+        {
+            DrawIcon(hDC,
+                rc.left + xOffset, rc.top + yOffset,
+                     (HICON)infoPtr->hImage);
+        }
+        else
         {
-            DrawIcon(hDC,
-                rc.left + xOffset, rc.top + yOffset,
-                     (HICON)infoPtr->hImage);
-        }
-        else
-        {
-            HDC hdcMem;
-
-            hdcMem = CreateCompatibleDC (hDC);
-            SelectObject (hdcMem, (HBITMAP)infoPtr->hImage);
-            BitBlt(hDC,
-                   rc.left + xOffset,
-                   rc.top + yOffset,
-                   imageWidth, imageHeight,
-                   hdcMem, 0, 0, SRCCOPY);
-
-            DeleteDC (hdcMem);
-        }
+            HDC hdcMem;
+
+            hdcMem = CreateCompatibleDC (hDC);
+            SelectObject (hdcMem, (HBITMAP)infoPtr->hImage);
+            BitBlt(hDC,
+                   rc.left + xOffset,
+                   rc.top + yOffset,
+                   imageWidth, imageHeight,
+                   hdcMem, 0, 0, SRCCOPY);
+        
+            DeleteDC (hdcMem);
+        }
 
         if(xOffset < 0 || yOffset < 0)
@@ -830 +830 @@
 
     rect=*rc;
-    SetBkMode(hDC,TRANSPARENT);
     DrawTextA( hDC, text, -1, &rect, DT_SINGLELINE | DT_CALCRECT);
     /* now text width and height are in rect.right and rect.bottom */
@@ -876 +875 @@
     {
         BOOL bHighLighted = ((infoPtr->state & BUTTON_HIGHLIGHTED) ||
-                             (infoPtr->state & BUTTON_CHECKED));
+                             (infoPtr->state & BUTTON_CHECKED));
 
         BUTTON_DrawPushButton(hwnd,
-                              hDC,
-                              action,
-                              bHighLighted);
-        return;
+                              hDC,
+                              action,
+                              bHighLighted);
+        return;
     }
 
@@ -896 +895 @@
      * particular case and the background is not painted at all.
      */
+    //SvL: 20/09/99: This works well for us. Now the background of
+    //               the dialog button strings in Solitaire is gray
+    SendMessageA(GetParent(hwnd),WM_CTLCOLORBTN,hDC,hwnd);
 
     hBrush = GetSysColorBrush(COLOR_BTNFACE);
@@ -951 +953 @@
             if (dwStyle & WS_DISABLED)
                 SetTextColor( hDC, GetSysColor(COLOR_GRAYTEXT) );
-            SetBkMode(hDC,TRANSPARENT);
             DrawTextA( hDC, text, -1, &rtext,
                          DT_SINGLELINE | DT_VCENTER );
@@ -1042 +1043 @@
             SetTextColor( hDC, GetSysColor(COLOR_GRAYTEXT) );
         rc.left += 10;
-        SetBkMode(hDC,TRANSPARENT);
         DrawTextA( hDC, text, -1, &rc, DT_SINGLELINE | DT_NOCLIP );
         free(text);