mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #23169 from neovim/backport-23163-to-release-0.9

Browse Source 
[Backport release-0.9] fix(mouse): cmdline click registered as statuscolumn
This commit is contained in:
zeertzjq
2023-04-18 08:19:10 +08:00
committed by GitHub
parent 8e2af977b1 54c6dfa009
commit 96de6bbaad
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/nvim/mouse.c
View File

@@ -1097,7 +1097,8 @@ retnomove:
return IN_UNKNOWN;
}
on_status_line = (grid == DEFAULT_GRID_HANDLE && row + wp->w_winbar_height >= wp->w_height)
bool below_window = grid == DEFAULT_GRID_HANDLE && row + wp->w_winbar_height >= wp->w_height;
on_status_line = (below_window)
? row + wp->w_winbar_height - wp->w_height + 1 == 1
: false;
@@ -1105,7 +1106,7 @@ retnomove:
? wp->w_winbar_height != 0
: false;
on_statuscol = !on_status_line && !on_winbar && col < win_col_off(wp)
on_statuscol = !below_window && !on_status_line && !on_winbar && col < win_col_off(wp)
? *wp->w_p_stc != NUL
: false;
@@ -1144,7 +1145,7 @@ retnomove:
dragwin = NULL;
// winpos and height may change in win_enter()!
if (grid == DEFAULT_GRID_HANDLE && row + wp->w_winbar_height >= wp->w_height) {
if (below_window) {
// In (or below) status line
status_line_offset = row + wp->w_winbar_height - wp->w_height + 1;
dragwin = wp;

3
test/functional/ui/statuscolumn_spec.lua
View File

@@ -457,6 +457,9 @@ describe('statuscolumn', function()
-- Check that statusline click doesn't register as statuscolumn click
meths.input_mouse('right', 'press', '', 0, 12, 0)
eq('', eval("g:testvar"))
-- Check that cmdline click doesn't register as statuscolumn click
meths.input_mouse('right', 'press', '', 0, 13, 0)
eq('', eval("g:testvar"))
end)
it('click labels do not leak memory', function()