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

Timestamp:

Oct 18, 2001, 11:06:02 PM (24 years ago)

Author:

umoeller

Message:

misc changes

File:

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

trunk/src/helpers/comctl.c

@@ -677 +677 @@
  *@@changed V0.9.0 [umoeller]: exported gpihIcon2Bitmap function to gpih.c
  *@@changed V0.9.0 [umoeller]: fixed paint errors when SM_SETHANDLE had NULL argument in mp1
+ *@@changed V0.9.16 (2001-10-15) [umoeller]: now centering icon in static properly
+ *@@changed V0.9.16 (2001-10-15) [umoeller]: this always used the presparam colors of the parent instead of its own ones
  */
 
@@ -683 +685 @@
     PANIMATIONDATA pa = (PANIMATIONDATA)WinQueryWindowULong(hwndStatic, QWL_USER);
                 // animation data which was stored in window words
+
     PFNWP   OldStaticProc = NULL;
     MRESULT mrc = NULL;
@@ -726 +729 @@
 
                 LONG lBkgndColor
-                    = winhQueryPresColor(WinQueryWindow(hwndStatic, QW_PARENT),
+                    /* = winhQueryPresColor(WinQueryWindow(hwndStatic, QW_PARENT),
                                          PP_BACKGROUNDCOLOR,
                                          FALSE,
+                                         SYSCLR_DIALOGBACKGROUND); */
+                    // fixed this... V0.9.16 (2001-10-15) [umoeller]
+                    = winhQueryPresColor(hwndStatic,
+                                         PP_BACKGROUNDCOLOR,
+                                         TRUE,
                                          SYSCLR_DIALOGBACKGROUND);
 
@@ -792 +800 @@
 
                                 if (pa->hptr)
+                                {
+                                    // center the icon in the bitmap
+                                    // V0.9.16 (2001-10-15) [umoeller]
+                                    POINTL ptlOfs;
+                                    ptlOfs.x = (   (pa->rclIcon.xRight - pa->rclIcon.xLeft)
+                                                 - pa->lIconSize
+                                               ) / 2;
+                                    ptlOfs.y = (   (pa->rclIcon.yTop - pa->rclIcon.yBottom)
+                                                 - pa->lIconSize
+                                               ) / 2;
+
                                     // paint icon into bitmap
                                     gpihIcon2Bitmap(hpsMem,
                                                     pa->hptr,
                                                     lBkgndColor,
-                                                    WinQuerySysValue(HWND_DESKTOP, SV_CXICON));
+                                                    &ptlOfs,
+                                                    pa->lIconSize);
+                                }
 
                             } // end if (pa->ulFlags & ANF_ICON)
@@ -933 +954 @@
 
 /*
+ *@@ CreateAnimationData:
+ *
+ *@@added V0.9.16 (2001-10-15) [umoeller]
+ */
+
+PANIMATIONDATA CreateAnimationData(HWND hwndStatic,
+                                   USHORT cAnimations)
+{
+    PANIMATIONDATA pa = NULL;
+
+    if (cAnimations >= 1)
+    {
+        // create the ANIMATIONDATA structure,
+        // initialize some fields,
+        // and store it in QWL_USER of the static control
+        ULONG   cbStruct =   sizeof(ANIMATIONDATA)
+                           + ((cAnimations - 1) * sizeof(HPOINTER));
+
+        if (pa = (PANIMATIONDATA)malloc(cbStruct))
+        {
+            memset(pa, 0, cbStruct);
+
+            WinSetWindowULong(hwndStatic, QWL_USER, (ULONG)pa);
+
+            pa->hab = WinQueryAnchorBlock(hwndStatic);
+            WinQueryWindowRect(hwndStatic, &pa->rclIcon);
+            pa->OldStaticProc = WinSubclassWindow(hwndStatic, ctl_fnwpBitmapStatic);
+            pa->lIconSize = WinQuerySysValue(HWND_DESKTOP, SV_CXICON);
+        }
+    }
+
+    return (pa);
+}
+
+/*
  *@@ ctlPrepareStaticIcon:
  *      turns a static control into one which properly
@@ -971 +1027 @@
                                                         // this must be at least 1
 {
-    PANIMATIONDATA pa = NULL;
-    PFNWP OldStaticProc = WinSubclassWindow(hwndStatic, ctl_fnwpBitmapStatic);
-    if (OldStaticProc)
+    PANIMATIONDATA pa;
+
+    if (pa = CreateAnimationData(hwndStatic,
+                                 usAnimCount))
     {
-        // create the ANIMATIONDATA structure,
-        // initialize some fields,
-        // and store it in QWL_USER of the static control
-        ULONG   cbStruct =   sizeof(ANIMATIONDATA)
-                           + ((usAnimCount-1) * sizeof(HPOINTER));
-        pa = (PANIMATIONDATA)malloc(cbStruct);
-        memset(pa, 0, cbStruct);
-
         // switch static to icon mode
         pa->ulFlags = ANF_ICON;
-        pa->OldStaticProc = OldStaticProc;
-        WinQueryWindowRect(hwndStatic, &(pa->rclIcon));
-        pa->hab = WinQueryAnchorBlock(hwndStatic);
-
-        WinSetWindowULong(hwndStatic, QWL_USER, (ULONG)pa);
     }
+
     return (pa);
 }
@@ -1057 +1102 @@
         paNew->usAniCurrent = 0;
         paNew->usAniCount = usAnimCount;
-        memcpy(&(paNew->ahptrAniIcons), pahptr,
-                        (usAnimCount * sizeof(HPOINTER)));
-
-        if (fStartAnimation) {
+        memcpy(&paNew->ahptrAniIcons,
+               pahptr,
+               (usAnimCount * sizeof(HPOINTER)));
+
+        if (fStartAnimation)
+        {
             WinStartTimer(WinQueryAnchorBlock(hwndStatic), hwndStatic,
                     1, ulDelay);
@@ -1155 +1202 @@
  *
  *@@added V0.9.0 [umoeller]
+ *@@changed V0.9.16 (2001-10-15) [umoeller]: some cleanup
  */
 
@@ -1160 +1208 @@
                                          BOOL fPreserveProportions)
 {
-    PANIMATIONDATA pa = NULL;
-    PFNWP OldStaticProc = WinSubclassWindow(hwndStatic, ctl_fnwpBitmapStatic);
-    if (OldStaticProc)
+    PANIMATIONDATA pa;
+
+    if (pa = CreateAnimationData(hwndStatic, 1))
     {
-        // create the ANIMATIONDATA structure,
-        // initialize some fields,
-        // and store it in QWL_USER of the static control
-        ULONG   cbStruct =   sizeof(ANIMATIONDATA);
-        pa = (PANIMATIONDATA)malloc(cbStruct);
-        memset(pa, 0, cbStruct);
-
         // switch static to bitmap mode
         pa->ulFlags = ANF_BITMAP;
         if (fPreserveProportions)
             pa->ulFlags |= ANF_PROPORTIONAL;
-
-        pa->OldStaticProc = OldStaticProc;
-        WinQueryWindowRect(hwndStatic, &(pa->rclIcon));
-        pa->hab = WinQueryAnchorBlock(hwndStatic);
-
-        WinSetWindowULong(hwndStatic, QWL_USER, (ULONG)pa);
     }
+
     return (pa);
 }