aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.2324: with of scrollbar in popup menu not taken into account

Browse Source 
Problem:    With of scrollbar in popup menu not taken into account.
Solution:   Add the width of the scrollbar.
This commit is contained in:
Bram Moolenaar 2019-11-21 12:12:35 +01:00
parent 403f3eb4c1
commit 202c3f7e3e
4 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/popupmenu.c
View File

@ -628,7 +628,7 @@ pum_redraw(void)
void void
pum_position_info_popup(win_T *wp) 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 row = pum_row;
int botpos = POPPOS_BOTLEFT; int botpos = POPPOS_BOTLEFT;
@ -745,7 +745,7 @@ pum_set_selected(int n, int repeat UNUSED)
#if defined(FEAT_QUICKFIX) #if defined(FEAT_QUICKFIX)
/* /*
* Show extra info in the preview window if there is something and * 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 when tried twice already.
* Skip this also when there is not much room. * Skip this also when there is not much room.
* NOTE: Be very careful not to sync undo! * NOTE: Be very careful not to sync undo!

14
src/testdir/dumps/Test_popupwin_infopopup_6.dump Normal file
View File

@ -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

6
src/testdir/test_popupwin.vim
View File

@ -2896,6 +2896,12 @@ func Test_popupmenu_info_border()
call term_sendkeys(buf, "\<C-N>\<C-N>") call term_sendkeys(buf, "\<C-N>\<C-N>")
call VerifyScreenDump(buf, 'Test_popupwin_infopopup_5', {}) 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 StopVimInTerminal(buf)
call delete('XtestInfoPopup') call delete('XtestInfoPopup')
endfunc endfunc

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2324,
/**/ /**/
2323, 2323,
/**/ /**/