Patch 8.1.2324
Problem: Width of scrollbar in popup menu not taken into account.
Solution: Add the width of the scrollbar.
Files: src/popupmenu.c, src/testdir/dumps/Test_popupwin_infopopup_6.dump,
src/testdir/test_popupwin.vim
*** ../vim-8.1.2323/src/popupmenu.c 2019-11-09 16:59:09.363100382 +0100
--- src/popupmenu.c 2019-11-21 12:07:52.139063512 +0100
***************
*** 628,634 ****
void
pum_position_info_popup(win_T *wp)
{
! int col = pum_col + pum_width + 1;
int row = pum_row;
int botpos = POPPOS_BOTLEFT;
--- 628,634 ----
void
pum_position_info_popup(win_T *wp)
{
! int col = pum_col + pum_width + pum_scrollbar + 1;
int row = pum_row;
int botpos = POPPOS_BOTLEFT;
***************
*** 745,751 ****
#if defined(FEAT_QUICKFIX)
/*
* Show extra info in the preview window if there is something and
! * 'completeopt' contains "preview" or "popup".
* Skip this when tried twice already.
* Skip this also when there is not much room.
* NOTE: Be very careful not to sync undo!
--- 745,751 ----
#if defined(FEAT_QUICKFIX)
/*
* Show extra info in the preview window if there is something and
! * '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!
*** ../vim-8.1.2323/src/testdir/dumps/Test_popupwin_infopopup_6.dump
2019-11-21 12:11:45.166089839 +0100
--- src/testdir/dumps/Test_popupwin_infopopup_6.dump 2019-11-21
12:07:52.139063512 +0100
***************
*** 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
*** ../vim-8.1.2323/src/testdir/test_popupwin.vim 2019-11-16
18:21:57.990848019 +0100
--- src/testdir/test_popupwin.vim 2019-11-21 12:07:52.139063512 +0100
***************
*** 2896,2901 ****
--- 2896,2907 ----
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
*** ../vim-8.1.2323/src/version.c 2019-11-19 23:01:24.643827472 +0100
--- src/version.c 2019-11-21 12:09:39.318619972 +0100
***************
*** 743,744 ****
--- 743,746 ----
{ /* Add new patch number below this line */
+ /**/
+ 2324,
/**/
--
hundred-and-one symptoms of being an internet addict:
93. New mail alarm on your palmtop annoys other churchgoers.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/201911211114.xALBEUVq024994%40masaka.moolenaar.net.
