patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yet
Problem: Popup_menu() and popup_filter_menu() are not implemented yet.
Solution: Implement the functions. Fix that centering didn't take the border
and padding into account.
diff --git a/src/screen.c b/src/screen.c
index 8708fd7..9886267 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4183,7 +4183,7 @@
*/
v = (long)(ptr - line);
cur = wp->w_match_head;
- shl_flag = (screen_line_flags & SLF_POPUP);
+ shl_flag = FALSE;
while (cur != NULL || shl_flag == FALSE)
{
if (shl_flag == FALSE
@@ -4193,6 +4193,8 @@
{
shl = &search_hl;
shl_flag = TRUE;
+ if (screen_line_flags & SLF_POPUP)
+ continue; // do not use search_hl
}
else
shl = &cur->hl;
@@ -4272,9 +4274,9 @@
/* Use attributes from match with highest priority among
* 'search_hl' and the match list. */
- search_attr = search_hl.attr_cur;
cur = wp->w_match_head;
shl_flag = FALSE;
+ search_attr = 0;
while (cur != NULL || shl_flag == FALSE)
{
if (shl_flag == FALSE
@@ -4284,6 +4286,8 @@
{
shl = &search_hl;
shl_flag = TRUE;
+ if (screen_line_flags & SLF_POPUP)
+ continue; // do not use search_hl
}
else
shl = &cur->hl;
@@ -5564,7 +5568,6 @@
{
/* Use attributes from match with highest priority among
* 'search_hl' and the match list. */
- char_attr = search_hl.attr;
cur = wp->w_match_head;
shl_flag = FALSE;
while (cur != NULL || shl_flag == FALSE)
@@ -5576,6 +5579,8 @@
{
shl = &search_hl;
shl_flag = TRUE;
+ if (screen_line_flags & SLF_POPUP)
+ continue; // do not use search_hl
}
else
shl = &cur->hl;