Skip to content

Commit

Permalink
patch 8.1.0065: balloon displayed at the wrong position
Browse files Browse the repository at this point in the history
Problem:    Balloon displayed at the wrong position.
Solution:   Do not reposition the popup menu at the cursor position.
  • Loading branch information
brammool committed Jun 17, 2018
1 parent 942b454 commit 0e6e179
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 4 deletions.
14 changes: 10 additions & 4 deletions src/popupmnu.c
Expand Up @@ -29,6 +29,7 @@ static int pum_scrollbar; /* TRUE when scrollbar present */
static int pum_row; /* top row of pum */
static int pum_col; /* left column of pum */

static win_T *pum_window = NULL;
static int pum_win_row;
static int pum_win_height;
static int pum_win_col;
Expand Down Expand Up @@ -110,6 +111,7 @@ pum_display(

// Remember the essential parts of the window position and size, so we
// can decide when to reposition the popup menu.
pum_window = curwin;
pum_win_row = curwin->w_wrow + W_WINROW(curwin);
pum_win_height = curwin->w_height;
pum_win_col = curwin->w_wincol;
Expand Down Expand Up @@ -846,10 +848,11 @@ pum_may_redraw(void)
if (!pum_visible())
return; // nothing to do

if (pum_win_row == curwin->w_wrow + W_WINROW(curwin)
&& pum_win_height == curwin->w_height
&& pum_win_col == curwin->w_wincol
&& pum_win_width == curwin->w_width)
if (pum_window != curwin
|| (pum_win_row == curwin->w_wrow + W_WINROW(curwin)
&& pum_win_height == curwin->w_height
&& pum_win_col == curwin->w_wincol
&& pum_win_width == curwin->w_width))
{
// window position didn't change, redraw in the same position
pum_redraw();
Expand Down Expand Up @@ -912,6 +915,9 @@ pum_position_at_mouse(int min_width)
pum_width = Columns - pum_col;
if (pum_width > pum_base_width + 1)
pum_width = pum_base_width + 1;

// Do not redraw at cursor position.
pum_window = NULL;
}

# endif
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -761,6 +761,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
65,
/**/
64,
/**/
Expand Down

0 comments on commit 0e6e179

Please sign in to comment.