thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.1.0355: incorrect adjusting the popup menu for the preview window

Browse Source 
Problem:    Incorrect adjusting the popup menu for the preview window.
Solution:   Compute position and height properl. (Ronan Pigott)  Also show at
            least ten items. (closes #3414)
This commit is contained in:
Bram Moolenaar
2018-09-09 15:27:59 +02:00
parent 53c8a478cc
commit a750ac2288
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/popupmnu.c
View File

@@ -141,8 +141,8 @@ pum_display(
if (p_ph > 0 && pum_height > p_ph) if (p_ph > 0 && pum_height > p_ph)
pum_height = p_ph; pum_height = p_ph;
/* Put the pum below "pum_win_row" if possible. If there are few lines decide /* Put the pum below "pum_win_row" if possible. If there are few lines
* on where there is more room. */ * decide on where there is more room. */
if (pum_win_row + 2 >= below_row - pum_height if (pum_win_row + 2 >= below_row - pum_height
&& pum_win_row - above_row > (below_row - above_row) / 2) && pum_win_row - above_row > (below_row - above_row) / 2)
{ {
@@ -196,11 +196,20 @@ pum_display(
return; return;
#if defined(FEAT_QUICKFIX) #if defined(FEAT_QUICKFIX)
/* If there is a preview window at the above avoid drawing over it. */ // If there is a preview window at the above avoid drawing over it.
if (pvwin != NULL && pum_row < above_row && pum_height > above_row) // Do keep at least 10 entries.
if (pvwin != NULL && pum_row < above_row && pum_height > 10)
{ {
pum_row += above_row; if (pum_win_row - above_row < 10)
pum_height -= above_row; {
pum_row = pum_win_row - 10;
pum_height = 10;
}
else
{
pum_row = above_row;
pum_height = pum_win_row - above_row;
}
} }
#endif #endif

2
src/version.c
View File

@@ -794,6 +794,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 */
/**/
355,
/**/ /**/
354, 354,
/**/ /**/