mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2026-07-31 12:49:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(floatwin): relative='cursor' may use outdated cursor position #40768

Browse Source 
Problem:
Cursor-relative floats can use stale screen coordinates after a cursor move is restored without a redraw.

Solution:
Validate the current cursor before converting cursor-relative coordinates.

Co-authored-by: zeertzjq <zeertzjq@outlook.com>
This commit is contained in:
tianrking
2026-07-28 19:32:35 +08:00
committed by GitHub
parent 916a6e9546
commit 089c415cb2
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/nvim/winfloat.c
View File

@@ -202,6 +202,7 @@ void win_config_float(win_T *wp, WinConfig fconfig)
wp->w_height = MAX(fconfig.height, 1);
if (fconfig.relative == kFloatRelativeCursor) {
validate_cursor(curwin);
fconfig.relative = kFloatRelativeWindow;
fconfig.row += curwin->w_wrow;
fconfig.col += curwin->w_wcol;

15
test/functional/ui/float_spec.lua
View File

@@ -357,12 +357,23 @@ describe('float window', function()
it('opened with correct position relative to the cursor', function()
local pos = exec_lua([[
local lines = {}
for _ = 1, 100 do lines[#lines + 1] = 'foo' end
vim.api.nvim_buf_set_lines(0, 0, -1, false, lines)
vim.api.nvim_win_set_cursor(0, { 50, 0 })
vim.cmd('normal! zz')
local view = vim.fn.winsaveview()
vim.api.nvim_win_set_cursor(0, { 1, 0 })
vim.fn.winrestview(view)
local bufnr = vim.api.nvim_create_buf(false, true)
local opts = { width = 10, height = 10, col = 7, row = 9, relative = 'cursor', style = 'minimal' }
local win_id = vim.api.nvim_open_win(bufnr, false, opts)
return vim.api.nvim_win_get_position(win_id)
return { vim.api.nvim_win_get_position(win_id), vim.fn.winline() - 1 }
]])
eq({ 9, 7 }, { pos[1], pos[2] })
eq(pos[2] + 9, pos[1][1])
eq(7, pos[1][2])
end)
it('opened with correct position relative to another window', function()