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

patch 8.2.2803: flicker when the popup menu has an info popup

Browse Source 
Problem:    Flicker when the popup menu has an info popup.
Solution:   Avoid drawing over the popup when it's going to be redrawn in the
            same position. (closes #8131)  Also avoid redrawing the scrollbar.
This commit is contained in:
Bram Moolenaar
2021-04-23 21:01:34 +02:00
parent a6aa16423f
commit e0c03c8e10
5 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/popupmenu.c
View File

@@ -40,10 +40,6 @@ static int pum_win_width;
// makes pum_visible() return FALSE even when there is a popup menu.
static int pum_pretend_not_visible = FALSE;
// When set the popup menu will redraw soon using the pum_win_ values. Do not
// draw over the poup menu area to avoid flicker.
static int pum_will_redraw = FALSE;
static int pum_set_selected(int n, int repeat);
#define PUM_DEF_HEIGHT 10
@@ -392,7 +388,7 @@ pum_under_menu(int row, int col)
&& row >= pum_row
&& row < pum_row + pum_height
&& col >= pum_col - 1
&& col < pum_col + pum_width;
&& col < pum_col + pum_width + pum_scrollbar;
}
/*
@@ -1048,6 +1044,32 @@ pum_visible(void)
return !pum_pretend_not_visible && pum_array != NULL;
}
/*
* Return TRUE if the popup can be redrawn in the same position.
*/
static int
pum_in_same_position(void)
{
return 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);
}
/*
* Return TRUE when pum_may_redraw() will call pum_redraw().
* This means that the pum area should not be overwritten to avoid flicker.
*/
int
pum_redraw_in_same_position(void)
{
if (!pum_visible() || pum_will_redraw)
return FALSE; // nothing to do
return pum_in_same_position();
}
/*
* Reposition the popup menu to adjust for window layout changes.
*/
@@ -1061,11 +1083,7 @@ pum_may_redraw(void)
if (!pum_visible() || pum_will_redraw)
return; // nothing to do
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))
if (pum_in_same_position())
{
// window position didn't change, redraw in the same position
pum_redraw();