Changeset 1243 for trunk/src

Timestamp:

Oct 10, 1999, 1:26:34 PM (26 years ago)

Author:

cbratschi

Message:

radio buttons fixed, disabled text output

Location:

trunk/src/user32

Files:

• button.cpp (modified) (8 diffs)
• uitools.cpp (modified) (6 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.7 1999-10-09 16:28:24 cbratschi Exp $ */
+/* $Id: button.cpp,v 1.8 1999-10-10 11:26:34 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -10 +10 @@
  */
 
-/* CB: todo
-   - update checkboxes.bmp to Win9x style
-     + color and transparent mask
-*/
-
 #include <string.h>
 #include <stdlib.h>
@@ -26 +21 @@
 //Prototypes
 
-static void PaintGrayOnGray(HDC hDC,HFONT hFont,RECT *rc,char *text,UINT format);
+static void DrawDisabledText(HDC hdc,char* text,RECT* rtext,UINT format);
 
 static void PB_Paint(HWND hwnd,HDC hDC,WORD action);
@@ -693 +688 @@
     if (textLen > 0 && (!(dwStyle & (BS_ICON|BS_BITMAP))))
     {
-        LOGBRUSH lb;
-
         textLen++;
         text = (char*)malloc(textLen);
         GetWindowTextA(hwnd,text,textLen);
-        GetObjectA( GetSysColorBrush(COLOR_BTNFACE), sizeof(lb), &lb );
-        if (dwStyle & WS_DISABLED && GetSysColor(COLOR_GRAYTEXT)==lb.lbColor)
+
+        if (dwStyle & WS_DISABLED) DrawDisabledText(hDC,text,&rc,DT_SINGLELINE | DT_CENTER | DT_VCENTER); else
         {
-            dprintf(("Disable button"));
-            /* don't write gray text on gray background */
-            PaintGrayOnGray( hDC,infoPtr->hFont,&rc,text,
-                               DT_CENTER | DT_VCENTER );
-        }
-        else
-        {
-            dprintf(("Enable button"));
-            SetTextColor( hDC, (dwStyle & WS_DISABLED) ?
-                                 GetSysColor(COLOR_GRAYTEXT) :
-                                 GetSysColor(COLOR_BTNTEXT) );
+            SetTextColor( hDC, GetSysColor(COLOR_BTNTEXT) );
             DrawTextA( hDC, text, -1, &rc,
                          DT_SINGLELINE | DT_CENTER | DT_VCENTER );
@@ -802 +785 @@
     }
 
+    SelectObject( hDC, hOldPen );
+    SelectObject( hDC, hOldBrush );
+
     if (infoPtr->state & BUTTON_HASFOCUS)
     {
@@ -807 +793 @@
         DrawFocusRect( hDC, &focus_rect );
     }
-
-
-    SelectObject( hDC, hOldPen );
-    SelectObject( hDC, hOldBrush );
-}
-
-/**********************************************************************
- *   PB_Paint & CB_Paint sub function                        [internal]
- *   Paint text using a raster brush to avoid gray text on gray
- *   background. 'format' can be a combination of DT_CENTER and
- *   DT_VCENTER to use this function in both PB_PAINT and
- *   CB_PAINT.   - Dirk Thierbach
- *
- *   FIXME: This and TEXT_GrayString should be eventually combined,
- *   so calling one common function from PB_Paint, CB_Paint and
- *   TEXT_GrayString will be enough. Also note that this
- *   function ignores the CACHE_GetPattern funcs.
- */
-
-static void PaintGrayOnGray(HDC hDC,HFONT hFont,RECT *rc,char *text,
-                            UINT format)
-{
-/*  This is the standard gray on gray pattern:
-    static const WORD Pattern[] = {0xAA,0x55,0xAA,0x55,0xAA,0x55,0xAA,0x55};
-*/
-/*  This pattern gives better readability with X Fonts.
-    FIXME: Maybe the user should be allowed to decide which he wants. */
-    static const WORD Pattern[] = {0x55,0xFF,0xAA,0xFF,0x55,0xFF,0xAA,0xFF};
-
-    HBITMAP hbm  = CreateBitmap( 8, 8, 1, 1, Pattern );
-    HDC hdcMem = CreateCompatibleDC(hDC);
-    HBITMAP hbmMem;
-    HBRUSH hBr;
-    RECT rect,rc2;
-
-    rect=*rc;
-    DrawTextA( hDC, text, -1, &rect, DT_SINGLELINE | DT_CALCRECT);
-    /* now text width and height are in rect.right and rect.bottom */
-    rc2=rect;
-    rect.left = rect.top = 0; /* drawing pos in hdcMem */
-    if (format & DT_CENTER) rect.left=(rc->right-rect.right)/2;
-    if (format & DT_VCENTER) rect.top=(rc->bottom-rect.bottom)/2;
-    hbmMem = CreateCompatibleBitmap( hDC,rect.right,rect.bottom );
-    SelectObject( hdcMem, hbmMem);
-    PatBlt( hdcMem,0,0,rect.right,rect.bottom,WHITENESS);
-      /* will be overwritten by DrawText, but just in case */
-    if (hFont) SelectObject( hdcMem, hFont);
-    DrawTextA( hdcMem, text, -1, &rc2, DT_SINGLELINE);
-      /* After draw: foreground = 0 bits, background = 1 bits */
-    hBr = SelectObject( hdcMem, CreatePatternBrush(hbm) );
-    DeleteObject( hbm );
-    PatBlt( hdcMem,0,0,rect.right,rect.bottom,0xAF0229);
-      /* only keep the foreground bits where pattern is 1 */
-    DeleteObject( SelectObject( hdcMem,hBr) );
-    BitBlt(hDC,rect.left,rect.top,rect.right,rect.bottom,hdcMem,0,0,SRCAND);
-      /* keep the background of the dest */
-    DeleteDC( hdcMem);
-    DeleteObject( hbmMem );
-}
-
+}
+
+
+static void DrawDisabledText(HDC hdc,char* text,RECT* rtext,UINT format)
+{
+  COLORREF textColor = (GetSysColor(COLOR_GRAYTEXT) == GetBkColor(hdc)) ? COLOR_BTNTEXT:COLOR_GRAYTEXT;
+  RECT rect = *rtext;
+  COLORREF oldMode;
+
+  //CB: bug in Open32 DrawText: underscore is always black! -> two black lines!
+  SetTextColor(hdc,GetSysColor(COLOR_3DHILIGHT));
+  DrawTextA(hdc,text,-1,&rect,format);
+  SetTextColor(hdc,GetSysColor(COLOR_GRAYTEXT));
+  oldMode = SetBkMode(hdc,TRANSPARENT);
+  OffsetRect(&rect,-1,-1);
+  DrawTextA(hdc,text,-1,&rect,format);
+  SetBkMode(hdc,oldMode);
+}
 
 /**********************************************************************
@@ -955 +899 @@
         if( text && action != ODA_SELECT )
         {
-          if (dwStyle & WS_DISABLED &&
-              GetSysColor(COLOR_GRAYTEXT) == GetBkColor(hDC)) {
-            /* don't write gray text on gray background */
-            PaintGrayOnGray( hDC, infoPtr->hFont, &rtext, text,
-                             DT_VCENTER);
-          } else {
-            if (dwStyle & WS_DISABLED)
-            {
-              RECT rect = rtext;
-              COLORREF oldMode;
-              HPEN oldPen;
-
-//CB: bug in Open32 DrawText: underscore is always black!, need workaround
-//    extract to PaintText(HDC hdc,char* text,RECT* rect);
-              SetTextColor(hDC,GetSysColor(COLOR_3DHILIGHT));
-              oldPen = SelectObject(hDC,GetSysColorPen(COLOR_3DHIGHLIGHT));
-              DrawTextA(hDC,text,-1,&rect,DT_SINGLELINE | DT_VCENTER);
-              SetTextColor(hDC,GetSysColor(COLOR_GRAYTEXT));
-              SelectObject(hDC,GetSysColorPen(COLOR_GRAYTEXT));
-              oldMode = SetBkMode(hDC,TRANSPARENT);
-              OffsetRect(&rect,-1,-1);
-              DrawTextA(hDC,text,-1,&rect,DT_SINGLELINE | DT_VCENTER);
-              SetBkMode(hDC,oldMode);
-              SelectObject(hDC,oldPen);
-            } else DrawTextA(hDC,text,-1,&rtext,DT_SINGLELINE | DT_VCENTER);
-          }
+
+          if (dwStyle & WS_DISABLED) DrawDisabledText(hDC,text,&rtext,DT_SINGLELINE | DT_VCENTER);
+          else DrawTextA(hDC,text,-1,&rtext,DT_SINGLELINE | DT_VCENTER);
         }
     }
@@ -1065 +986 @@
         if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
         rc.left += 10;
-        if (dwStyle & WS_DISABLED &&
-            GetSysColor(COLOR_GRAYTEXT) == GetBkColor(hDC))
-            PaintGrayOnGray( hDC,infoPtr->hFont,&rc,text,DT_SINGLELINE | DT_NOCLIP );
-         else
+
+        if (dwStyle & WS_DISABLED) DrawDisabledText(hDC,text,&rc,DT_SINGLELINE | DT_NOCLIP); else
         {
-            SetTextColor( hDC, (dwStyle & WS_DISABLED) ?
-                                 GetSysColor(COLOR_GRAYTEXT) :
-                                 GetSysColor(COLOR_BTNTEXT) );
+            SetTextColor( hDC, GetSysColor(COLOR_BTNTEXT) );
             DrawTextA( hDC, text, -1, &rc,
                          DT_SINGLELINE | DT_NOCLIP );

trunk/src/user32/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.11 1999-10-09 16:28:25 cbratschi Exp $ */
+/* $Id: uitools.cpp,v 1.12 1999-10-10 11:26:34 cbratschi Exp $ */
 /*
  * User Interface Functions
@@ -797 +797 @@
 
     /* Define bounding box */
-    i = 14*SmallDiam/16;
+    i = (14*SmallDiam)/16;
     myr.left   = xc - i+i/2;
     myr.right  = xc + i/2;
@@ -845 +845 @@
         }
 
-        i = 10*SmallDiam/16;
+        i = (10*SmallDiam)/16,1;
         myr.left   = xc - i+i/2;
         myr.right  = xc + i/2;
@@ -853 +853 @@
         hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i));
         hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i));
-        Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
+        Ellipse(dc,myr.left,myr.top,myr.right,myr.bottom);
         SelectObject(dc, hbsave);
         SelectObject(dc, hpsave);
@@ -860 +860 @@
     if(uFlags & DFCS_CHECKED)
     {
-        i = 6*SmallDiam/16;
+        i = (6*SmallDiam)/16;
         i = i < 1 ? 1 : i;
         myr.left   = xc - i+i/2;
@@ -870 +870 @@
         hbsave = (HBRUSH)SelectObject(dc, GetSysColorBrush(i));
         hpsave = (HPEN)SelectObject(dc, GetSysColorPen(i));
-        Pie(dc, myr.left, myr.top, myr.right, myr.bottom, xe, ye, xe, ye);
+        Ellipse(dc,myr.left,myr.top,myr.right,myr.bottom);
         SelectObject(dc, hpsave);
         SelectObject(dc, hbsave);