Changeset 116 for trunk/src/helpers/comctl.c

Timestamp:

Nov 1, 2001, 6:43:18 PM (24 years ago)

Author:

umoeller

Message:

More updates.

File:

• trunk/src/helpers/comctl.c (modified) (5 diffs)

trunk/src/helpers/comctl.c

@@ -133 +133 @@
  *
  *@@added V0.9.13 (2001-06-21) [umoeller]
+ *@@changed V0.9.16 (2001-10-24) [umoeller]: fixed wrong hatch color and paint offset
+ *@@changed V0.9.16 (2001-10-28) [umoeller]: added bitmap support, fixed bad clip rectangle
  */
 
@@ -172 +174 @@
     {
         // button border:
-
         // now paint button frame
+
+        // make rcl inclusive
         rclWin.xRight--;
         rclWin.yTop--;
@@ -203 +206 @@
         cy = rclWin.yTop - rclWin.yBottom;
 
-        ptl.x = rclWin.xLeft + ((cx - pxbd->cxMiniIcon) / 2);
-        ptl.y = rclWin.yBottom + ((cy - pxbd->cxMiniIcon) / 2);
+        ptl.x = rclWin.xLeft + ((cx - pxbd->cxIconOrBitmap) / 2);
+        ptl.y = rclWin.yBottom + ((cy - pxbd->cyIconOrBitmap) / 2);
 
         if (fl & XBF_INUSE)
@@ -214 +217 @@
             ptl2.y = ptl.y - 2;
             GpiMove(hps,
-                    &ptl);
+                    &ptl2);     // &ptl
+                                // duh, typo V0.9.16 (2001-10-24) [umoeller]
             GpiSetPattern(hps, PATSYM_DIAG1);
-            ptl2.x = ptl.x + pxbd->cxMiniIcon + 1; // inclusive!
-            ptl2.y = ptl.y + pxbd->cxMiniIcon + 1; // inclusive!
+            GpiSetColor(hps, RGBCOL_BLACK);     // V0.9.16 (2001-10-24) [umoeller]
+            ptl2.x = ptl.x + pxbd->cxIconOrBitmap + 1; // inclusive!
+            ptl2.y = ptl.y + pxbd->cyIconOrBitmap + 1; // inclusive!
             GpiBox(hps,
                    DRO_FILL,
@@ -226 +231 @@
 
         // now paint icon
-        GpiIntersectClipRectangle(hps, &rclWin);    // exclusive!
-        WinDrawPointer(hps,
-                       // center this in remaining rectl
-                       ptl.x + ulOfs,
-                       ptl.y - ulOfs,
-                       pxbd->hptr,
-                       DP_MINI);
+
+        // make rcl inclusive           // V0.9.16 (2001-10-28) [umoeller]
+        rclWin.xRight--;
+        rclWin.yTop--;
+        GpiIntersectClipRectangle(hps,
+                                  &rclWin);    // inclusive!
+
+        // center this in remaining rectl
+        ptl.x += ulOfs;
+        ptl.y -= ulOfs;
+        if (fl & XBF_BITMAP)
+            // V0.9.16 (2001-10-28) [umoeller]
+            WinDrawBitmap(hps,
+                          pxbd->hptr,           // a bitmap really
+                          NULL,                 // entire bitmap
+                          &ptl,
+                          0,
+                          0,
+                          DBM_NORMAL);
+        else
+            WinDrawPointer(hps,
+                           // center this in remaining rectl
+                           ptl.x + ulOfs,
+                           ptl.y - ulOfs,
+                           pxbd->hptr,
+                           DP_MINI);
     }
 }