[PATCH 2/3] comctl32/tooltips: Set current tool before sending TTN_NEEDTEXT
Nikolay Sivov
nsivov at codeweavers.com
Mon Sep 11 04:40:04 CDT 2017
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/comctl32/tooltips.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c
index 41146f1253..030e775fed 100644
--- a/dlls/comctl32/tooltips.c
+++ b/dlls/comctl32/tooltips.c
@@ -588,7 +588,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate)
NMHDR hdr;
int ptfx = 0;
DWORD style = GetWindowLongW(infoPtr->hwndSelf, GWL_STYLE);
- INT nTool;
+ INT nTool, current;
if (track_activate)
{
@@ -611,16 +611,20 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate)
TRACE("Show tooltip pre %d! (%p)\n", nTool, infoPtr->hwndSelf);
+ current = infoPtr->nCurrentTool;
+ if (!track_activate)
+ infoPtr->nCurrentTool = infoPtr->nTool;
+
TOOLTIPS_GetTipText (infoPtr, nTool, infoPtr->szTipText);
if (infoPtr->szTipText[0] == '\0')
+ {
+ infoPtr->nCurrentTool = current;
return;
+ }
toolPtr = &infoPtr->tools[nTool];
- if (!track_activate)
- infoPtr->nCurrentTool = infoPtr->nTool;
-
TRACE("Show tooltip %d!\n", nTool);
hdr.hwndFrom = infoPtr->hwndSelf;
--
2.14.1
More information about the wine-patches
mailing list