aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-28 04:24:06 -04:00
Code Activity

patch 9.0.0638: popup menu highlight wrong on top of preview popup

Browse Source 
Problem:    Popup menu highlight wrong on top of preview popup. (Yegappan
            Lakshmanan)
Solution:   Also check for the popup menu in screen_line().
This commit is contained in:
Bram Moolenaar
2022-10-02 14:28:30 +01:00
parent eda29c971c
commit 393f8d61f5
7 changed files with 114 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/screen.c
View File

@@ -419,6 +419,27 @@ reset_screen_attr(void)
screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH;
}
/*
* Return TRUE if the character at "row" / "col" is under the popup menu and it
* will be redrawn soon or it is under another popup.
*/
static int
skip_for_popup(int row, int col)
{
// Popup windows with zindex higher than POPUPMENU_ZINDEX go on top.
if (pum_under_menu(row, col, TRUE)
#ifdef FEAT_PROP_POPUP
&& screen_zindex <= POPUPMENU_ZINDEX
#endif
)
return TRUE;
#ifdef FEAT_PROP_POPUP
if (blocked_by_popup(row, col))
return TRUE;
#endif
return FALSE;
}
/*
* Move one "cooked" screen line to the screen, but only the characters that
* have actually changed. Handle insert/delete character.
@@ -538,10 +559,10 @@ screen_line(
redraw_this = TRUE;
}
#endif
#ifdef FEAT_PROP_POPUP
if (blocked_by_popup(row, col + coloff))
// Do not redraw if under the popup menu.
if (redraw_this && skip_for_popup(row, col + coloff))
redraw_this = FALSE;
#endif
if (redraw_this)
{
/*
@@ -669,15 +690,11 @@ screen_line(
}
#endif
ScreenAttrs[off_to] = ScreenAttrs[off_from];
ScreenCols[off_to] = ScreenCols[off_from];
// For simplicity set the attributes of second half of a
// double-wide character equal to the first half.
if (char_cells == 2)
{
ScreenAttrs[off_to + 1] = ScreenAttrs[off_from];
ScreenCols[off_to + 1] = ScreenCols[off_from + 1];
}
if (enc_dbcs != 0 && char_cells == 2)
screen_char_2(off_to, row, col + coloff);
@@ -2165,17 +2182,8 @@ screen_char(unsigned off, int row, int col)
return;
// Skip if under the popup menu.
// Popup windows with zindex higher than POPUPMENU_ZINDEX go on top.
if (pum_under_menu(row, col, TRUE)
#ifdef FEAT_PROP_POPUP
&& screen_zindex <= POPUPMENU_ZINDEX
#endif
)
if (skip_for_popup(row, col))
return;
#ifdef FEAT_PROP_POPUP
if (blocked_by_popup(row, col))
return;
#endif
// Outputting a character in the last cell on the screen may scroll the
// screen up. Only do it when the "xn" termcap property is set, otherwise