Mercurial > vim
changeset 32297:64e6e523d32d v9.0.1480
patch 9.0.1480: using popup menu may leave text in the command line
Commit: https://github.com/vim/vim/commit/dcd40cfca0fe0e65d405ce9711745a8ec846c30c
Author: Luuk van Baal <luukvbaal@gmail.com>
Date: Sun Apr 23 16:24:08 2023 +0100
patch 9.0.1480: using popup menu may leave text in the command line
Problem: Using popup menu may leave text in the command line.
Solution: Clear the command line if the popup menu covered it. (Luuk van
Baal, closes #12286)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sun, 23 Apr 2023 17:30:05 +0200 |
| parents | a113ead89676 |
| children | dace7bf9cd79 |
| files | src/popupmenu.c src/testdir/dumps/Test_popupmenu_cmdline_1.dump src/testdir/test_menu.vim src/version.c |
| diffstat | 4 files changed, 35 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupmenu.c +++ b/src/popupmenu.c @@ -18,6 +18,7 @@ static int pum_selected; // index of se static int pum_first = 0; // index of top item static int call_update_screen = FALSE; +static int pum_in_cmdline = FALSE; static int pum_height; // nr of displayed pum items static int pum_width; // width of displayed pum items @@ -1067,6 +1068,11 @@ pum_undisplay(void) pum_array = NULL; redraw_all_later(UPD_NOT_VALID); redraw_tabline = TRUE; + if (pum_in_cmdline) + { + clear_cmdline = TRUE; + pum_in_cmdline = FALSE; + } status_redraw_all(); #if defined(FEAT_PROP_POPUP) && defined(FEAT_QUICKFIX) // hide any popup info window @@ -1193,6 +1199,8 @@ pum_position_at_mouse(int min_width) pum_row = mouse_row + 1; if (pum_height > Rows - pum_row) pum_height = Rows - pum_row; + if (pum_row + pum_height > cmdline_row) + pum_in_cmdline = TRUE; } else {
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_popupmenu_cmdline_1.dump @@ -0,0 +1,4 @@ +>a+0&#ffffff0|b|c|d|e| @69 +|a|b|c|d|e| @69 +|a|b|c|d|e| @69 +@57|1|,|1| @10|T|o|p|
--- a/src/testdir/test_menu.vim +++ b/src/testdir/test_menu.vim @@ -594,4 +594,25 @@ func Test_unmenu_while_listing_menus() call StopVimInTerminal(buf) endfunc +" Test for opening a menu drawn in the cmdline area +func Test_popupmenu_cmdline() + CheckRunVimInTerminal + + let lines =<< trim END + set mousemodel=popup + menu PopUp.Test1 :<CR> + menu PopUp.Test2 :<CR> + menu PopUp.Test3 :<CR> + call setline(1, repeat(['abcde'], 5)) + END + call writefile(lines, 'Xpopupcmdline', 'D') + let buf = RunVimInTerminal('-S Xpopupcmdline', {'rows': 4}) + + " cmdline area should be cleared when popupmenu that covered it is closed + call term_sendkeys(buf, "\<RightMouse>\<RightRelease>\<Esc>") + call VerifyScreenDump(buf, 'Test_popupmenu_cmdline_1', {}) + + call StopVimInTerminal(buf) +endfunc + " vim: shiftwidth=2 sts=2 expandtab