Skip to content

W
wine-winehq
Commit abefaa5d authored by Noel Borthwick's avatar Noel Borthwick Committed by Alexandre Julliard
Browse files
Options

Fixed bug with tooltips stealing focus whenever a tooltip was created,

shown, hidden or tracked. The SetWindowPos calls needed to have the SWP_NOACTIVATE flag set additionally.
parent b5e41aa5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 5 deletions
dlls/comctl32/tooltips.c
View file @ abefaa5d
...@@ -253,7 +253,7 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr) ...@@ -253,7 +253,7 @@ TOOLTIPS_Show (HWND hwnd, TOOLTIPS_INFO *infoPtr)
SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top, SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top, rect.right - rect.left, rect.bottom - rect.top,
SWP_SHOWWINDOW); SWP_SHOWWINDOW | SWP_NOACTIVATE);
/* repaint the tooltip */ /* repaint the tooltip */
hdc = GetDC (hwnd); hdc = GetDC (hwnd);
...@@ -286,7 +286,7 @@ TOOLTIPS_Hide (HWND hwnd, TOOLTIPS_INFO *infoPtr) ...@@ -286,7 +286,7 @@ TOOLTIPS_Hide (HWND hwnd, TOOLTIPS_INFO *infoPtr)
infoPtr->nCurrentTool = -1; infoPtr->nCurrentTool = -1;
SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0,
SWP_NOZORDER | SWP_HIDEWINDOW); SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
} }
...@@ -370,7 +370,7 @@ TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr) ...@@ -370,7 +370,7 @@ TOOLTIPS_TrackShow (HWND hwnd, TOOLTIPS_INFO *infoPtr)
SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top, SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top, rect.right - rect.left, rect.bottom - rect.top,
SWP_SHOWWINDOW); SWP_SHOWWINDOW | SWP_NOACTIVATE );
hdc = GetDC (hwnd); hdc = GetDC (hwnd);
TOOLTIPS_Refresh (hwnd, hdc); TOOLTIPS_Refresh (hwnd, hdc);
...@@ -397,7 +397,7 @@ TOOLTIPS_TrackHide (HWND hwnd, TOOLTIPS_INFO *infoPtr) ...@@ -397,7 +397,7 @@ TOOLTIPS_TrackHide (HWND hwnd, TOOLTIPS_INFO *infoPtr)
(WPARAM)toolPtr->uId, (LPARAM)&hdr); (WPARAM)toolPtr->uId, (LPARAM)&hdr);
SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0,
SWP_NOZORDER | SWP_HIDEWINDOW); SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
} }
...@@ -1864,7 +1864,7 @@ TOOLTIPS_Create (HWND hwnd, WPARAM wParam, LPARAM lParam) ...@@ -1864,7 +1864,7 @@ TOOLTIPS_Create (HWND hwnd, WPARAM wParam, LPARAM lParam)
else else
FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: error!\n"); FIXME (tooltips, " -- WM_NOTIFYFORMAT returns: error!\n");
SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOZORDER | SWP_HIDEWINDOW); SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOZORDER | SWP_HIDEWINDOW | SWP_NOACTIVATE);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment