Changeset 1229 for trunk/src

Timestamp:

Oct 9, 1999, 6:28:25 PM (26 years ago)

Author:

cbratschi

Message:

merged with WINE, button: gray text for radio/checkbox, more to do

Location:

trunk/src/user32

Files:

• button.cpp (modified) (3 diffs)
• uitools.cpp (modified) (7 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.6 1999-10-09 11:03:22 sandervl Exp $ */
+/* $Id: button.cpp,v 1.7 1999-10-09 16:28:24 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -962 +962 @@
           } else {
             if (dwStyle & WS_DISABLED)
-                SetTextColor( hDC, GetSysColor(COLOR_GRAYTEXT) );
-            DrawTextA( hDC, text, -1, &rtext,
-                         DT_SINGLELINE | DT_VCENTER );
+            {
+              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);
           }
         }
@@ -1049 +1064 @@
         GetWindowTextA(hwnd,text,textLen);
         if (infoPtr->hFont) SelectObject( hDC, infoPtr->hFont );
-        if (dwStyle & WS_DISABLED)
-            SetTextColor( hDC, GetSysColor(COLOR_GRAYTEXT) );
         rc.left += 10;
-        DrawTextA( hDC, text, -1, &rc, DT_SINGLELINE | DT_NOCLIP );
+        if (dwStyle & WS_DISABLED &&
+            GetSysColor(COLOR_GRAYTEXT) == GetBkColor(hDC))
+            PaintGrayOnGray( hDC,infoPtr->hFont,&rc,text,DT_SINGLELINE | DT_NOCLIP );
+         else
+        {
+            SetTextColor( hDC, (dwStyle & WS_DISABLED) ?
+                                 GetSysColor(COLOR_GRAYTEXT) :
+                                 GetSysColor(COLOR_BTNTEXT) );
+            DrawTextA( hDC, text, -1, &rc,
+                         DT_SINGLELINE | DT_NOCLIP );
+        }
+
         free(text);
     }

trunk/src/user32/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.10 1999-10-05 18:23:49 sandervl Exp $ */
+/* $Id: uitools.cpp,v 1.11 1999-10-09 16:28:25 cbratschi Exp $ */
 /*
  * User Interface Functions
@@ -8 +8 @@
  * Copyright 1999 Christoph Bratschi
  * Copyright 1999 Rene Pronk
+ *
+ * WINE version: 990923
  */
 
@@ -617 +619 @@
 
 
+static void UITOOLS_DrawCheckedRect( HDC dc, LPRECT rect )
+{
+    if(GetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255))
+    {
+      HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55);
+      HBRUSH hbsave;
+      HBRUSH hb = CreatePatternBrush(hbm);
+      COLORREF bg;
+
+      FillRect(dc, rect, GetSysColorBrush(COLOR_BTNFACE));
+      bg = SetBkColor(dc, RGB(255, 255, 255));
+      hbsave = (HBRUSH)SelectObject(dc, hb);
+      PatBlt(dc, rect->left, rect->top, rect->right-rect->left, rect->bottom-rect->top, 0x00FA0089);
+      SelectObject(dc, hbsave);
+      SetBkColor(dc, bg);
+      DeleteObject(hb);
+      DeleteObject(hbm);
+    }
+    else
+    {
+        FillRect(dc, rect, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
+    }
+}
+
 /************************************************************************
  *      UITOOLS_DFC_ButtonPush
@@ -643 +669 @@
             UITOOLS95_DrawRectEdge(dc, &myr, edge, (uFlags&DFCS_FLAT)|BF_RECT|BF_SOFT|BF_ADJUST);
 
-        if(GetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255))
-        {
-            HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55);
-            HBRUSH hbsave;
-            HBRUSH hb = CreatePatternBrush(hbm);
-
-            FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
-            hbsave = (HBRUSH)SelectObject(dc, hb);
-            PatBlt(dc, myr.left, myr.top, myr.right-myr.left, myr.bottom-myr.top, 0x00FA0089);
-            SelectObject(dc, hbsave);
-            DeleteObject(hb);
-            DeleteObject(hbm);
+        UITOOLS_DrawCheckedRect( dc, &myr );
         }
         else
         {
-            FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
-        }
-    }
-    else
-    {
         if(uFlags & DFCS_MONO)
         {
@@ -688 +698 @@
 
 /************************************************************************
- *      UITOOLS_DFC_ButtonChcek
+ *      UITOOLS_DFC_ButtonCheck
  *
  * Draw a check/3state button coming from DrawFrameControl()
@@ -702 +712 @@
     RECT myr;
     int SmallDiam = UITOOLS_MakeSquareRect(r, &myr);
-    int BorderShrink = SmallDiam / 16;
-
-    if(BorderShrink < 1) BorderShrink = 1;
-
-    /* FIXME: The FillRect() sequence doesn't work for sizes less than */
-    /* 4 pixels in diameter. Not really a problem but it isn't M$'s */
-    /* 100% equivalent. */
-    if(uFlags & (DFCS_FLAT|DFCS_MONO))
-    {
-        FillRect(dc, &myr, GetSysColorBrush(COLOR_WINDOWFRAME));
-        myr.left   += 2 * BorderShrink;
-        myr.right  -= 2 * BorderShrink;
-        myr.top    += 2 * BorderShrink;
-        myr.bottom -= 2 * BorderShrink;
-    }
-    else
-    {
-        FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
-        myr.right  -= BorderShrink;
-        myr.bottom -= BorderShrink;
-        FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNSHADOW));
-        myr.left   += BorderShrink;
-        myr.top    += BorderShrink;
-        FillRect(dc, &myr, GetSysColorBrush(COLOR_3DLIGHT));
-        myr.right  -= BorderShrink;
-        myr.bottom -= BorderShrink;
-        FillRect(dc, &myr, GetSysColorBrush(COLOR_3DDKSHADOW));
-        myr.left   += BorderShrink;
-        myr.top    += BorderShrink;
-    }
+    UINT flags = BF_RECT | BF_ADJUST;
+
+    if(uFlags & DFCS_FLAT) flags |= BF_FLAT;
+    else if(uFlags & DFCS_MONO) flags |= BF_MONO;
+
+    UITOOLS95_DrawRectEdge( dc, &myr, EDGE_SUNKEN, flags );
 
     if(uFlags & (DFCS_INACTIVE|DFCS_PUSHED))
-    {
         FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
-    }
-    else if(uFlags & DFCS_CHECKED)
-    {
-        if(GetSysColor(COLOR_BTNHIGHLIGHT) == RGB(255, 255, 255))
-        {
-            HBITMAP hbm = CreateBitmap(8, 8, 1, 1, wPattern_AA55);
-            HBRUSH hbsave;
-            HBRUSH hb = CreatePatternBrush(hbm);
-
-            FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNFACE));
-            hbsave = (HBRUSH)SelectObject(dc, hb);
-            PatBlt(dc, myr.left, myr.top, myr.right-myr.left, myr.bottom-myr.top, 0x00FA0089);
-            SelectObject(dc, hbsave);
-            DeleteObject(hb);
-            DeleteObject(hbm);
-        }
-        else
-        {
-            FillRect(dc, &myr, GetSysColorBrush(COLOR_BTNHIGHLIGHT));
-        }
-    }
+    else if( (uFlags & DFCS_BUTTON3STATE) && (uFlags & DFCS_CHECKED) )
+        UITOOLS_DrawCheckedRect( dc, &myr );
     else
     {
@@ -1139 +1105 @@
     int tri = 290*SmallDiam/1000 -1;
     int d46, d93;
+
+    /*
+     * This fixes a problem with really tiny "scroll" buttons. In particular
+     * with the updown control.
+     * Making sure that the arrow is as least 3 pixels wide (or high).
+     */
+    if (tri == 0)
+      tri = 1;
 
     switch(uFlags & 0xff)