diff options
| author | Jarek Czekalski | 2014-05-06 18:00:30 +0200 |
|---|---|---|
| committer | Jarek Czekalski | 2014-05-06 18:00:30 +0200 |
| commit | 863f07dea0ce02fd8263f5363c9d50504fc4af6e (patch) | |
| tree | 96cf9c1b763a41827d8b601b1468a63776a82703 /src | |
| parent | c5d670f5ad4759c4efff952ae55b563889f4a517 (diff) | |
| download | emacs-863f07dea0ce02fd8263f5363c9d50504fc4af6e.tar.gz emacs-863f07dea0ce02fd8263f5363c9d50504fc4af6e.zip | |
Fix tooltips pulling Emacs window to front on windows-nt, bug #17408.
* w32fns.c (Fx_show_tip): Add SWP_NOOWNERZORDER flag to
SetWindowPos invocations.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/w32fns.c | 10 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 9839b6a2146..720ab11135f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-05-06 Jarek Czekalski <jarekczek@poczta.onet.pl> | ||
| 2 | |||
| 3 | Stop tooltips pulling Emacs window to front (Bug#17408). | ||
| 4 | * w32fns.c (Fx_show_tip): Add SWP_NOOWNERZORDER flag to | ||
| 5 | SetWindowPos invocations. | ||
| 6 | |||
| 1 | 2014-05-05 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2014-05-05 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 8 | ||
| 3 | * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system | 9 | * nsselect.m (Fx_selection_exists_p): Just return Qnil if window system |
diff --git a/src/w32fns.c b/src/w32fns.c index ffe63a3cf2d..630059c38f1 100644 --- a/src/w32fns.c +++ b/src/w32fns.c | |||
| @@ -6036,12 +6036,13 @@ Text larger than the specified size is clipped. */) | |||
| 6036 | /* Put tooltip in topmost group and in position. */ | 6036 | /* Put tooltip in topmost group and in position. */ |
| 6037 | SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST, | 6037 | SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST, |
| 6038 | root_x, root_y, 0, 0, | 6038 | root_x, root_y, 0, 0, |
| 6039 | SWP_NOSIZE | SWP_NOACTIVATE); | 6039 | SWP_NOSIZE | SWP_NOACTIVATE | SWP_NOOWNERZORDER); |
| 6040 | 6040 | ||
| 6041 | /* Ensure tooltip is on top of other topmost windows (eg menus). */ | 6041 | /* Ensure tooltip is on top of other topmost windows (eg menus). */ |
| 6042 | SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOP, | 6042 | SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOP, |
| 6043 | 0, 0, 0, 0, | 6043 | 0, 0, 0, 0, |
| 6044 | SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); | 6044 | SWP_NOMOVE | SWP_NOSIZE |
| 6045 | | SWP_NOACTIVATE | SWP_NOOWNERZORDER); | ||
| 6045 | 6046 | ||
| 6046 | unblock_input (); | 6047 | unblock_input (); |
| 6047 | goto start_timer; | 6048 | goto start_timer; |
| @@ -6239,12 +6240,13 @@ Text larger than the specified size is clipped. */) | |||
| 6239 | SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST, | 6240 | SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST, |
| 6240 | root_x, root_y, | 6241 | root_x, root_y, |
| 6241 | rect.right - rect.left + FRAME_COLUMN_WIDTH (f), | 6242 | rect.right - rect.left + FRAME_COLUMN_WIDTH (f), |
| 6242 | rect.bottom - rect.top, SWP_NOACTIVATE); | 6243 | rect.bottom - rect.top, SWP_NOACTIVATE | SWP_NOOWNERZORDER); |
| 6243 | 6244 | ||
| 6244 | /* Ensure tooltip is on top of other topmost windows (eg menus). */ | 6245 | /* Ensure tooltip is on top of other topmost windows (eg menus). */ |
| 6245 | SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOP, | 6246 | SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOP, |
| 6246 | 0, 0, 0, 0, | 6247 | 0, 0, 0, 0, |
| 6247 | SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE); | 6248 | SWP_NOMOVE | SWP_NOSIZE |
| 6249 | | SWP_NOACTIVATE | SWP_NOOWNERZORDER); | ||
| 6248 | 6250 | ||
| 6249 | /* Let redisplay know that we have made the frame visible already. */ | 6251 | /* Let redisplay know that we have made the frame visible already. */ |
| 6250 | SET_FRAME_VISIBLE (f, 1); | 6252 | SET_FRAME_VISIBLE (f, 1); |