- Make sure tooltips are hidden before deleting them.
- Glitch happened while moving from a tooltip to another (fixed).
This commit is contained in:
parent
feb87374ba
commit
27a76c8473
|
@ -880,6 +880,9 @@ TOOLTIPS_DelToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
|
|
||||||
TRACE("tool %d\n", nTool);
|
TRACE("tool %d\n", nTool);
|
||||||
|
|
||||||
|
/* make sure the tooltip has disappeared before deleting it */
|
||||||
|
TOOLTIPS_Hide(hwnd, infoPtr);
|
||||||
|
|
||||||
/* delete text string */
|
/* delete text string */
|
||||||
toolPtr = &infoPtr->tools[nTool];
|
toolPtr = &infoPtr->tools[nTool];
|
||||||
if ((toolPtr->hinst) && (toolPtr->lpszText)) {
|
if ((toolPtr->hinst) && (toolPtr->lpszText)) {
|
||||||
|
@ -941,6 +944,13 @@ TOOLTIPS_DelToolA (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
COMCTL32_Free (oldTools);
|
COMCTL32_Free (oldTools);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* destroying tool that mouse was on on last relayed mouse move */
|
||||||
|
if (infoPtr->nTool == nTool)
|
||||||
|
{
|
||||||
|
/* no current tool (0 means first tool) */
|
||||||
|
infoPtr->nTool = -1;
|
||||||
|
}
|
||||||
|
|
||||||
infoPtr->uNumTools--;
|
infoPtr->uNumTools--;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -967,6 +977,9 @@ TOOLTIPS_DelToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
|
|
||||||
TRACE("tool %d\n", nTool);
|
TRACE("tool %d\n", nTool);
|
||||||
|
|
||||||
|
/* make sure the tooltip has disappeared before deleting it */
|
||||||
|
TOOLTIPS_Hide(hwnd, infoPtr);
|
||||||
|
|
||||||
/* delete text string */
|
/* delete text string */
|
||||||
toolPtr = &infoPtr->tools[nTool];
|
toolPtr = &infoPtr->tools[nTool];
|
||||||
if ((toolPtr->hinst) && (toolPtr->lpszText)) {
|
if ((toolPtr->hinst) && (toolPtr->lpszText)) {
|
||||||
|
@ -1028,6 +1041,13 @@ TOOLTIPS_DelToolW (HWND hwnd, WPARAM wParam, LPARAM lParam)
|
||||||
COMCTL32_Free (oldTools);
|
COMCTL32_Free (oldTools);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* destroying tool that mouse was on on last relayed mouse move */
|
||||||
|
if (infoPtr->nTool == nTool)
|
||||||
|
{
|
||||||
|
/* no current tool (0 means first tool) */
|
||||||
|
infoPtr->nTool = -1;
|
||||||
|
}
|
||||||
|
|
||||||
infoPtr->uNumTools--;
|
infoPtr->uNumTools--;
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in New Issue