Changeset 4573 for trunk/src/user32/oslibres.cpp

Timestamp:

Nov 9, 2000, 7:15:23 PM (25 years ago)

Author:

sandervl

Message:

Icon api rewrite + small fixes

File:

• trunk/src/user32/oslibres.cpp (modified) (6 diffs)

trunk/src/user32/oslibres.cpp

@@ -1 @@
-/* $Id: oslibres.cpp,v 1.10 2000-03-13 13:10:47 sandervl Exp $ */
+/* $Id: oslibres.cpp,v 1.11 2000-11-09 18:15:18 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -24 +24 @@
 #include "pmwindow.h"
 
-#define DBG_LOCALLOG    DBG_oslibres
+#define DBG_LOCALLOG    DBG_oslibres
 #include "dbglocal.h"
 
@@ -46 +46 @@
 }
 //******************************************************************************
-//******************************************************************************
-HANDLE OSLibWinCreateIcon(PVOID iconbitmap)
+//TODO: change search method for icon array (cxDesired, cyDesired)
+//TODO: PM rescales the icon internally!!! ($W(#*&$(*%&)
+//******************************************************************************
+HANDLE OSLibWinCreateIcon(PVOID iconbitmap, ULONG cxDesired, ULONG cyDesired)
 {
  POINTERINFO pointerInfo = {0};
@@ -102 +104 @@
     hps = WinGetScreenPS(HWND_DESKTOP);
 
-    hbmColor = GpiCreateBitmap(hps, &bfhColor->bmp2, CBM_INIT,
-                               (char *)bafh + bfhColor->offBits,
-                               (BITMAPINFO2 *)&bfhColor->bmp2);
+    //Resize icon bitmap if requested size is different
+    if(cxDesired != bfhColor->bmp2.cx|| cyDesired != bfhColor->bmp2.cy)
+    {
+        BITMAPINFOHEADER2 infohdr = bfhColor->bmp2;
+
+        infohdr.cx = cxDesired;
+        infohdr.cy = cyDesired;
+        hbmColor = GpiCreateBitmap(hps, &infohdr, CBM_INIT,
+                                   (char *)bafh + bfhColor->offBits,
+                                   (BITMAPINFO2 *)&bfhColor->bmp2);
+    }
+    else {
+        hbmColor = GpiCreateBitmap(hps, &bfhColor->bmp2, CBM_INIT,
+                                   (char *)bafh + bfhColor->offBits,
+                                   (BITMAPINFO2 *)&bfhColor->bmp2);
+    }
     if(hbmColor == GPI_ERROR) {
         dprintf(("OSLibWinCreateIcon: GpiCreateBitmap failed!"));
@@ -110 +125 @@
         return 0;
     }
-    hbmMask = GpiCreateBitmap(hps, &bfhBW->bmp2, CBM_INIT,
-                              (char *)bafh + bfhBW->offBits,
-                              (BITMAPINFO2 *)&bfhBW->bmp2);
+    //Resize icon mask if requested size is different
+    if(cxDesired != bfhBW->bmp2.cx|| cyDesired*2 != bfhBW->bmp2.cy)
+    {
+        BITMAPINFOHEADER2 infohdr = bfhBW->bmp2;
+
+        infohdr.cx = cxDesired;
+        infohdr.cy = cyDesired;
+        hbmMask = GpiCreateBitmap(hps, &infohdr, CBM_INIT,
+                                  (char *)bafh + bfhBW->offBits,
+                                  (BITMAPINFO2 *)&bfhBW->bmp2);
+    }
+    else {
+        hbmMask = GpiCreateBitmap(hps, &bfhBW->bmp2, CBM_INIT,
+                                  (char *)bafh + bfhBW->offBits,
+                                  (BITMAPINFO2 *)&bfhBW->bmp2);
+    }
     if(hbmMask == GPI_ERROR) {
         dprintf(("OSLibWinCreateIcon: GpiCreateBitmap hbmMask failed!"));
@@ -132 +160 @@
     GpiDeleteBitmap(hbmColor);
     WinReleasePS(hps);
+
     return hIcon;
 }
 //******************************************************************************
-//******************************************************************************
-HANDLE OSLibWinCreatePointer(PVOID cursorbitmap)
+//TODO: change cursor size if required!! (cxDesired, cyDesired)
+//******************************************************************************
+HANDLE OSLibWinCreatePointer(PVOID cursorbitmap, ULONG cxDesired, ULONG cyDesired)
 {
  POINTERINFO pointerInfo = {0};