Mercurial > vim
changeset 18665:7369756d05de v8.1.2324
patch 8.1.2324: with of scrollbar in popup menu not taken into account
Commit: https://github.com/vim/vim/commit/202c3f7e3e5a90135ad37100fbfd6583c84a6c99
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Nov 21 12:12:35 2019 +0100
patch 8.1.2324: with of scrollbar in popup menu not taken into account
Problem: With of scrollbar in popup menu not taken into account.
Solution: Add the width of the scrollbar.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 21 Nov 2019 12:15:06 +0100 |
| parents | daa71bf6b546 |
| children | d451a92c772c |
| files | src/popupmenu.c src/testdir/dumps/Test_popupwin_infopopup_6.dump src/testdir/test_popupwin.vim src/version.c |
| diffstat | 4 files changed, 24 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupmenu.c +++ b/src/popupmenu.c @@ -628,7 +628,7 @@ pum_redraw(void) void pum_position_info_popup(win_T *wp) { - int col = pum_col + pum_width + 1; + int col = pum_col + pum_width + pum_scrollbar + 1; int row = pum_row; int botpos = POPPOS_BOTLEFT; @@ -745,7 +745,7 @@ pum_set_selected(int n, int repeat UNUSE #if defined(FEAT_QUICKFIX) /* * Show extra info in the preview window if there is something and - * 'completeopt' contains "preview" or "popup". + * 'completeopt' contains "preview" or "popup" or "popuphidden". * Skip this when tried twice already. * Skip this also when there is not much room. * NOTE: Be very careful not to sync undo!
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_popupwin_infopopup_6.dump @@ -0,0 +1,14 @@ +|a+0&#ffffff0|w|o|r|d> @17|╔+0&#ffff4012|═@15|X| +0&#ffffff0@33 +|w+0#0000001#e0e0e08|r|d| @4|W| |e|x|t|r|a| |t|e|x|t| @1| +0#0000000#0000001|║+0&#ffff4012| |w|o|r|d|s| |a|r|e| |c|o@1|l| |║| +0#4040ff13#ffffff0@33 +|a+0#0000001#ffd7ff255|n|o|t|w|r|d| |W| |e|x|t|r|a| |t|e|x|t| @1| +0#0000000#0000001|╚+0&#ffff4012|═@15|⇲| +0#4040ff13#ffffff0@33 +|n+0#0000001#ffd7ff255|o|a|w|r|d| @1|W| |e|x|t|r|a| |t|e|x|t| @1| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@51 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|-+2#0000000&@1| |U|s|e|r| |d|e|f|i|n|e|d| |c|o|m|p|l|e|t|i|o|n| |(|^|U|^|N|^|P|)| |m+0#00e0003&|a|t|c|h| |1| |o|f| |4| +0#0000000&@26
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -2896,6 +2896,12 @@ func Test_popupmenu_info_border() call term_sendkeys(buf, "\<C-N>\<C-N>") call VerifyScreenDump(buf, 'Test_popupwin_infopopup_5', {}) + " Test that the popupmenu's scrollbar and infopopup do not overlap + call term_sendkeys(buf, "\<Esc>") + call term_sendkeys(buf, ":set pumheight=3\<CR>") + call term_sendkeys(buf, "cc\<C-X>\<C-U>") + call VerifyScreenDump(buf, 'Test_popupwin_infopopup_6', {}) + call StopVimInTerminal(buf) call delete('XtestInfoPopup') endfunc