diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-11-05 21:09:23 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-11-05 21:09:23 +0100 |
commit | ae20f340adc8c96aeec5cff5ef4f2129035ffca4 (patch) | |
tree | 1053beba1daad179dfb22958fbfe86f9a633e93e /src/gui_w32.c | |
parent | e5a3272d32ad52f905ef3e66991871dbef2245e7 (diff) |
patch 8.1.2257: MS-Windows GUI: scroll wheel always uses current windowv8.1.2257
Problem: MS-Windows GUI: scroll wheel always uses current window.
Solution: Add the 'scrollfocus' option for MS-Windows.
Diffstat (limited to 'src/gui_w32.c')
-rw-r--r-- | src/gui_w32.c | 74 |
1 files changed, 36 insertions, 38 deletions
diff --git a/src/gui_w32.c b/src/gui_w32.c index 3cf782cab0..02d2e096b5 100644 --- a/src/gui_w32.c +++ b/src/gui_w32.c @@ -4234,60 +4234,58 @@ init_mouse_wheel(void) } -/* Intellimouse wheel handler */ +/* + * Intellimouse wheel handler. + * Treat a mouse wheel event as if it were a scroll request. + */ static void _OnMouseWheel( HWND hwnd, short zDelta) { -/* Treat a mouse wheel event as if it were a scroll request */ int i; int size; HWND hwndCtl; + win_T *wp; - if (curwin->w_scrollbars[SBAR_RIGHT].id != 0) - { - hwndCtl = curwin->w_scrollbars[SBAR_RIGHT].id; - size = curwin->w_scrollbars[SBAR_RIGHT].size; - } - else if (curwin->w_scrollbars[SBAR_LEFT].id != 0) - { - hwndCtl = curwin->w_scrollbars[SBAR_LEFT].id; - size = curwin->w_scrollbars[SBAR_LEFT].size; - } - else - return; - - size = curwin->w_height; if (mouse_scroll_lines == 0) init_mouse_wheel(); -#ifdef FEAT_TEXT_PROP - { - win_T *wp = gui_mouse_window(FIND_POPUP); + wp = gui_mouse_window(FIND_POPUP); - if (wp != NULL && popup_is_popup(wp)) - { - cmdarg_T cap; - oparg_T oa; - - // Mouse hovers over popup window, scroll it if possible. - mouse_row = wp->w_winrow; - mouse_col = wp->w_wincol; - vim_memset(&cap, 0, sizeof(cap)); - cap.arg = zDelta < 0 ? MSCR_UP : MSCR_DOWN; - cap.cmdchar = zDelta < 0 ? K_MOUSEUP : K_MOUSEDOWN; - clear_oparg(&oa); - cap.oap = &oa; - nv_mousescroll(&cap); - update_screen(0); - setcursor(); - out_flush(); - return; - } +#ifdef FEAT_TEXT_PROP + if (wp != NULL && popup_is_popup(wp)) + { + cmdarg_T cap; + oparg_T oa; + + // Mouse hovers over popup window, scroll it if possible. + mouse_row = wp->w_winrow; + mouse_col = wp->w_wincol; + vim_memset(&cap, 0, sizeof(cap)); + cap.arg = zDelta < 0 ? MSCR_UP : MSCR_DOWN; + cap.cmdchar = zDelta < 0 ? K_MOUSEUP : K_MOUSEDOWN; + clear_oparg(&oa); + cap.oap = &oa; + nv_mousescroll(&cap); + update_screen(0); + setcursor(); + out_flush(); + return; } #endif + if (wp == NULL || !p_scf) + wp = curwin; + + if (wp->w_scrollbars[SBAR_RIGHT].id != 0) + hwndCtl = wp->w_scrollbars[SBAR_RIGHT].id; + else if (wp->w_scrollbars[SBAR_LEFT].id != 0) + hwndCtl = wp->w_scrollbars[SBAR_LEFT].id; + else + return; + size = wp->w_height; + mch_disable_flush(); if (mouse_scroll_lines > 0 && mouse_scroll_lines < (size > 2 ? size - 2 : 1)) |