ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Partially repair hotspot handling.

This commit is contained in:
Dave Hawkes 2002-02-26 00:33:51 +00:00 committed by Alexandre Julliard
parent 73ab649ced
commit 770a5bfa2d
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/comctl32/imagelist.c
View File

@ -21,6 +21,11 @@
* ImageList_DrawIndirect. Since ImageList_DrawIndirect is still * ImageList_DrawIndirect. Since ImageList_DrawIndirect is still
* partially implemented, the functions mentioned above will be * partially implemented, the functions mentioned above will be
* limited in functionality too. * 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...
*/ */
#include <stdlib.h> #include <stdlib.h>
@ -53,9 +58,10 @@ typedef struct
BOOL bShow; BOOL bShow;
/* saved background */ /* saved background */
HBITMAP hbmBg; HBITMAP hbmBg;
BOOL bHSPending;
} INTERNALDRAG; } INTERNALDRAG;
static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0 }; static INTERNALDRAG InternalDrag = { 0, 0, 0, 0, 0, 0, FALSE, 0, FALSE };
@ -747,6 +753,7 @@ ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack,
DeleteDC (hdcDst); DeleteDC (hdcDst);
InternalDrag.himl->cCurImage = 1; InternalDrag.himl->cCurImage = 1;
InternalDrag.bHSPending = TRUE;
return TRUE; return TRUE;
} }
@ -1071,10 +1078,16 @@ ImageList_DragEnter (HWND hwndLock, INT x, INT y)
BOOL WINAPI BOOL WINAPI
ImageList_DragLeave (HWND hwndLock) 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; InternalDrag.hwnd = hwndLock;
else else
InternalDrag.hwnd = GetDesktopWindow (); InternalDrag.hwnd = GetDesktopWindow (); */
if(!hwndLock)
hwndLock = GetDesktopWindow();
if(InternalDrag.hwnd != hwndLock)
FIXME("DragLeave hWnd != DragEnter hWnd\n");
ImageList_DragShowNolock (FALSE); ImageList_DragShowNolock (FALSE);
@ -1489,6 +1502,7 @@ ImageList_EndDrag (void)
InternalDrag.bShow = FALSE; InternalDrag.bShow = FALSE;
DeleteObject(InternalDrag.hbmBg); DeleteObject(InternalDrag.hbmBg);
InternalDrag.hbmBg = 0; InternalDrag.hbmBg = 0;
InternalDrag.bHSPending = FALSE;
return TRUE; return TRUE;
} }
@ -2600,8 +2614,14 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag,
* dxHotspot, dyHotspot is the offset of THE Hotspot (there is only one * dxHotspot, dyHotspot is the offset of THE Hotspot (there is only one
* hotspot) to the origin of the second image. * hotspot) to the origin of the second image.
* See M$DN for details */ * See M$DN for details */
dx = InternalDrag.dxHotspot - dxHotspot; if(InternalDrag.bHSPending) {
dy = InternalDrag.dyHotspot - dyHotspot; 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); himlTemp = ImageList_Merge (InternalDrag.himl, 0, himlDrag, iDrag, dx, dy);
if (visible) { if (visible) {
@ -2620,12 +2640,10 @@ ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag,
/* update the InternalDragOffset, if the origin of the /* update the InternalDragOffset, if the origin of the
* DragImage was changed by ImageList_Merge. */ * DragImage was changed by ImageList_Merge. */
if (dx > InternalDrag.dxHotspot) { if (dx <= 0)
InternalDrag.dxHotspot = dx; InternalDrag.dxHotspot = dxHotspot;
} if (dy <= 0)
if (dy > InternalDrag.dyHotspot) { InternalDrag.dyHotspot = dyHotspot;
InternalDrag.dyHotspot = dy;
}
if (visible) { if (visible) {
/* show the drag image */ /* show the drag image */