diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-06-16 19:05:31 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-06-16 19:05:31 +0200 |
| commit | a730e55cc2d3045a79a340a5af1ad4a749058a32 (patch) | |
| tree | 91bd4f6fa1348c3d132198a857ec98902239d43f /src/screen.c | |
| parent | 983f2f1403a591779f6edc4dd973c6cf31c65c8b (diff) | |
patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yetv8.1.1558
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.
Diffstat (limited to 'src/screen.c')
| -rw-r--r-- | src/screen.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/screen.c b/src/screen.c index 8708fd7c21..9886267419 100644 --- a/src/screen.c +++ b/src/screen.c @@ -4183,7 +4183,7 @@ win_line( */ 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 @@ win_line( { 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 @@ win_line( /* 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 @@ win_line( { 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 @@ win_line( { /* 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 @@ win_line( { shl = &search_hl; shl_flag = TRUE; + if (screen_line_flags & SLF_POPUP) + continue; // do not use search_hl } else shl = &cur->hl; |