From 35b6a84eb0bad1d37769fde7413c90a8c7d1f246 Mon Sep 17 00:00:00 2001 From: Keith Simmons Date: Sat, 26 Jun 2021 20:52:54 -0700 Subject: [PATCH 1/4] use window relative floating windows --- autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim b/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim index af4e940..605a8c0 100644 --- a/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim +++ b/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim @@ -213,6 +213,10 @@ function! s:FloatingWindow.open(args) abort \ 'origin': get(a:args, 'origin', 'topleft'), \ } + if has('nvim') + l:style.relative = get(a:args, 'relative', 'editor) + endif + let l:will_move = self.is_visible() if l:will_move let self._winid = s:_move(self, self._winid, self._bufnr, l:style) @@ -376,7 +380,7 @@ if has('nvim') let l:style = s:_resolve_origin(a:style) let l:style = s:_resolve_border(l:style) let l:style = { - \ 'relative': 'editor', + \ 'relative': has_key(l:style, 'relative') ? l:style.relative : 'editor', \ 'row': l:style.row - 1, \ 'col': l:style.col - 1, \ 'width': l:style.width, From 2c8989a607a97878f6f7107ba0399e375ffc1c85 Mon Sep 17 00:00:00 2001 From: Keith Simmons Date: Sat, 26 Jun 2021 22:37:19 -0700 Subject: [PATCH 2/4] fix typo --- autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim b/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim index 605a8c0..07812e7 100644 --- a/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim +++ b/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim @@ -214,7 +214,7 @@ function! s:FloatingWindow.open(args) abort \ } if has('nvim') - l:style.relative = get(a:args, 'relative', 'editor) + l:style.relative = get(a:args, 'relative', 'editor') endif let l:will_move = self.is_visible() From aecbffaf4fd9378f09ac494e524c12ad971b0351 Mon Sep 17 00:00:00 2001 From: Keith Simmons Date: Sat, 26 Jun 2021 22:51:55 -0700 Subject: [PATCH 3/4] more typos --- autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim b/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim index 07812e7..6e5da51 100644 --- a/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim +++ b/autoload/vital/_compe/VS/Vim/Window/FloatingWindow.vim @@ -214,7 +214,7 @@ function! s:FloatingWindow.open(args) abort \ } if has('nvim') - l:style.relative = get(a:args, 'relative', 'editor') + let l:style.relative = get(a:args, 'relative', 'editor') endif let l:will_move = self.is_visible() From 2bd0769bc6a5cb8f1057145b24fb2753d1d4fd88 Mon Sep 17 00:00:00 2001 From: Keith Simmons Date: Thu, 12 Aug 2021 12:46:35 -0700 Subject: [PATCH 4/4] rebase my fix on upstream --- lua/compe/float.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/compe/float.lua b/lua/compe/float.lua index 748264b..10ecfee 100644 --- a/lua/compe/float.lua +++ b/lua/compe/float.lua @@ -50,7 +50,7 @@ function M.get_options(contents, opts) local col = right and right_col - 1 or (pum.col - width - 3) return { - relative = "editor", + relative = "win", style = "minimal", width = width, height = height,