Changeset 8382 for trunk/src/comctl32/imagelist.c

Timestamp:

May 8, 2002, 1:26:30 PM (23 years ago)

Author:

sandervl

Message:

merge with latest Wine

File:

• trunk/src/comctl32/imagelist.c (modified) (10 diffs)

trunk/src/comctl32/imagelist.c

@@ -6 +6 @@
  *            2001 Michael Stefaniuc
  *            2001 Charles Loep for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *
  *  TODO:
@@ -22 +36 @@
  *      partially implemented, the functions mentioned above will be 
  *      limited in functionality too.
+ *
+ *    - Hotspot handling still not correct. The Hotspot passed to BeginDrag
+ *      is the offset of the image position relative to the actual mouse pointer
+ *      position. However the Hotspot passed to SetDragCursorImage is the
+ *      offset of the mouse messages sent to the application...
  */
 
@@ -32 +51 @@
 #include "commctrl.h"
 #include "imagelist.h"
-#include "debugtools.h"
-
-DEFAULT_DEBUG_CHANNEL(imagelist);
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(imagelist);
 
 
@@ -54 +73 @@
     /* saved background */
     HBITMAP     hbmBg;
+    BOOL        bHSPending;
 } INTERNALDRAG;
 
-static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0 };
+static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0, FALSE };
 
 
@@ -748 +768 @@
 
     InternalDrag.himl->cCurImage = 1;
+    InternalDrag.bHSPending = TRUE;
 
     return TRUE;
@@ -1072 +1093 @@
 ImageList_DragLeave (HWND hwndLock)
 {
-    if (hwndLock)
+    /* As we don't save drag info in the window this can lead to problems if
+       an app does not supply the same window as DragEnter */
+    /* if (hwndLock)
         InternalDrag.hwnd = hwndLock;
     else
-        InternalDrag.hwnd = GetDesktopWindow ();
+        InternalDrag.hwnd = GetDesktopWindow (); */
+    if(!hwndLock)
+        hwndLock = GetDesktopWindow();
+    if(InternalDrag.hwnd != hwndLock)
+        FIXME("DragLeave hWnd != DragEnter hWnd\n");
 
     ImageList_DragShowNolock (FALSE);
@@ -1490 +1517 @@
     DeleteObject(InternalDrag.hbmBg);
     InternalDrag.hbmBg = 0;
+    InternalDrag.bHSPending = FALSE;
 
     return TRUE;
@@ -2601 +2629 @@
      * hotspot) to the origin of the second image.
      * See M$DN for details */
-    dx = InternalDrag.dxHotspot - dxHotspot;
-    dy = InternalDrag.dyHotspot - dyHotspot;
+    if(InternalDrag.bHSPending) {
+        dx = 0;
+        dy = 0;
+        InternalDrag.bHSPending = FALSE;
+    } else {
+        dx = InternalDrag.dxHotspot - dxHotspot;
+        dy = InternalDrag.dyHotspot - dyHotspot;
+    }
     himlTemp = ImageList_Merge (InternalDrag.himl, 0, himlDrag, iDrag, dx, dy);
 
@@ -2621 +2655 @@
     /* update the InternalDragOffset, if the origin of the
      * DragImage was changed by ImageList_Merge. */
-    if (dx > InternalDrag.dxHotspot) {
-        InternalDrag.dxHotspot = dx;
-    }
-    if (dy > InternalDrag.dyHotspot) {
-        InternalDrag.dyHotspot = dy;
-    }
+    if (dx <= 0)
+        InternalDrag.dxHotspot = dxHotspot;
+    if (dy <= 0)
+        InternalDrag.dyHotspot = dyHotspot;
 
     if (visible) {
@@ -2934 +2966 @@
 
     if(bitCount == 1) {
-        //Hack.
+        /* Hack. */
         LPBITMAPINFO inf = (LPBITMAPINFO)bmih;
         inf->bmiColors[0].rgbRed = inf->bmiColors[0].rgbGreen = inf->bmiColors[0].rgbBlue = 0;