Mercurial > vim
changeset 16998:2ec0f953ec3f v8.1.1499
patch 8.1.1499: ruler not updated after popup window was removed
commit https://github.com/vim/vim/commit/24a5ac5d4dbc4dc5d6d2b7e4dda6612dd9233f5d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 8 19:01:18 2019 +0200
patch 8.1.1499: ruler not updated after popup window was removed
Problem: Ruler not updated after popup window was removed.
Solution: use popup_mask in screen_puts().
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 08 Jun 2019 19:15:06 +0200 |
| parents | c92a414a53b9 |
| children | 7eaf8a6452c3 |
| files | src/screen.c src/testdir/dumps/Test_popupwin_07.dump src/testdir/dumps/Test_popupwin_08.dump src/testdir/test_popupwin.vim src/version.c |
| diffstat | 5 files changed, 40 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -7897,7 +7897,11 @@ screen_puts_len( || ScreenAttrs[off] != attr || exmode_active; - if (need_redraw || force_redraw_this) + if ((need_redraw || force_redraw_this) +#ifdef FEAT_TEXT_PROP + && popup_mask[row * screen_Columns + col] <= screen_zindex +#endif + ) { #if defined(FEAT_GUI) || defined(UNIX) /* The bold trick makes a single row of pixels appear in the next
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_popupwin_07.dump @@ -0,0 +1,10 @@ +> +0&#ffffff0@74 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @52|o+0#0000001#ffd7ff255|t|h|e|r| |t|a|b| @11 +|~+0#4040ff13#ffffff0| @52|a+0#0000001#ffd7ff255| |c+0#ff404010&|o|m@1|e|n|t| +0#0000001&|l|i|n|e| @6 +|:+0#0000000#ffffff0|c|a|l@1| |p|o|p|u|p|_|m|o|v|e|(|p|o|p|u|p|w|i|n|,| |{|'|l|i|n|e|'|:| |7|,| |'|c|o|l|'|:| |5@1|}|)| @3|t+0#0000001#ffd7ff255|h|i|s| |l|i|n|e| |w|i|l@1| |n|o|t| |f|i +| +0#0000000#ffffff0@53|t+0#0000001#ffd7ff255| |h|e|r|e| @14
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_popupwin_08.dump @@ -0,0 +1,10 @@ +>x+0&#ffffff0@2| @71 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +| +0#0000000&@74 +@57|1|,|1| @10|A|l@1|
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -51,6 +51,19 @@ func Test_simple_popup() call term_sendkeys(buf, ":redraw\<CR>") call VerifyScreenDump(buf, 'Test_popupwin_06', {}) + " move popup over ruler + call term_sendkeys(buf, ":set cmdheight=2\<CR>") + call term_sendkeys(buf, ":call popup_move(popupwin, {'line': 7, 'col': 55})\<CR>") + call VerifyScreenDump(buf, 'Test_popupwin_07', {}) + + " clear all popups after moving the cursor a bit, so that ruler is updated + call term_sendkeys(buf, "axxx\<Esc>") + call term_wait(buf) + call term_sendkeys(buf, "0") + call term_wait(buf) + call term_sendkeys(buf, ":popupclear\<CR>") + call VerifyScreenDump(buf, 'Test_popupwin_08', {}) + " clean up call StopVimInTerminal(buf) call delete('XtestPopup')