diff options
Diffstat (limited to 'src/w32fns.c')
| -rw-r--r-- | src/w32fns.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/w32fns.c b/src/w32fns.c index bc2e728b49d..95ba34fc1e4 100644 --- a/src/w32fns.c +++ b/src/w32fns.c @@ -3298,6 +3298,14 @@ w32_wnd_proc (hwnd, msg, wParam, lParam) return (msg == WM_XBUTTONDOWN || msg == WM_XBUTTONUP); case WM_MOUSEMOVE: + /* Ignore mouse movements as long as the menu is active. These + movements are processed by the window manager anyway, and + it's wrong to handle them as if they happened on the + underlying frame. */ + f = x_window_to_frame (dpyinfo, hwnd); + if (f && f->output_data.w32->menubar_active) + return 0; + /* If the mouse has just moved into the frame, start tracking it, so we will be notified when it leaves the frame. Mouse tracking only works under W98 and NT4 and later. On earlier @@ -7730,9 +7738,12 @@ Text larger than the specified size is clipped. */) AdjustWindowRect (&rect, f->output_data.w32->dwStyle, FRAME_EXTERNAL_MENU_BAR (f)); - /* Position and size tooltip, and put it in the topmost group. */ + /* Position and size tooltip, and put it in the topmost group. + The add-on of 3 to the 5th argument is a kludge: without it, + some fonts cause the last character of the tip to be truncated, + for some obscure reason. */ SetWindowPos (FRAME_W32_WINDOW (f), HWND_TOPMOST, - root_x, root_y, rect.right - rect.left, + root_x, root_y, rect.right - rect.left + 3, rect.bottom - rect.top, SWP_NOACTIVATE); /* Ensure tooltip is on top of other topmost windows (eg menus). */ |