Mercurial > vim
changeset 32323:29631532eceb v9.0.1493
patch 9.0.1493: popup menu position wrong in window with toolbar
Commit: https://github.com/vim/vim/commit/4e1ca0d9a6c6d66987da67155e97f83f286ffbcc
Author: zeertzjq <zeertzjq@outlook.com>
Date: Thu Apr 27 19:36:55 2023 +0100
patch 9.0.1493: popup menu position wrong in window with toolbar
Problem: Popup menu position wrong in window with toolbar.
Solution: Take the window toolbar into account when positioning the popup
menu. (closes #12308)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 27 Apr 2023 20:45:03 +0200 |
parents | 8d73e57dd491 |
children | 9c7575089724 |
files | src/popupmenu.c src/testdir/dumps/Test_popup_command_06.dump src/testdir/test_popup.vim src/version.c |
diffstat | 4 files changed, 33 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupmenu.c +++ b/src/popupmenu.c @@ -1649,7 +1649,7 @@ pum_make_popup(char_u *path_name, int us { // Hack: set mouse position at the cursor so that the menu pops up // around there. - mouse_row = curwin->w_winrow + curwin->w_wrow; + mouse_row = W_WINROW(curwin) + curwin->w_wrow; mouse_col = curwin->w_wincol + curwin->w_wcol; }
new file mode 100644 --- /dev/null +++ b/src/testdir/dumps/Test_popup_command_06.dump @@ -0,0 +1,20 @@ +| +0&#e0e0e08| +2#ffffff16#6c6c6c255|T|E|S|T| | +0#0000000#e0e0e08@67 +|o+0&#ffffff0|n|e| |t|w|o| |t|h|r|e@1| |f|o|u|r| |f|i|v|e| @51 +|a|n|d| |o|n|e| |t|w|o| >X|t|h|r|e@1| |f|o|u|r| |f|i|v|e| @46 +|o|n|e| |m|o|r|e| |t|w| +0#0000001#ffd7ff255|U|n|d|o| @12| +0#0000000#ffffff0@45 +|~+0#4040ff13&| @9| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@45 +|~| @9| +0#0000001#ffd7ff255|P|a|s|t|e| @11| +0#4040ff13#ffffff0@45 +|~| @9| +0#0000001#ffd7ff255@17| +0#4040ff13#ffffff0@45 +|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |W|o|r|d| @5| +0#4040ff13#ffffff0@45 +|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |S|e|n|t|e|n|c|e| @1| +0#4040ff13#ffffff0@45 +|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |P|a|r|a|g|r|a|p|h| | +0#4040ff13#ffffff0@45 +|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |L|i|n|e| @5| +0#4040ff13#ffffff0@45 +|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |B|l|o|c|k| @4| +0#4040ff13#ffffff0@45 +|~| @9| +0#0000001#ffd7ff255|S|e|l|e|c|t| |A|l@1| @6| +0#4040ff13#ffffff0@45 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|:+0#0000000&|p|o|p|u|p| |P|o|p|U|p| @62
--- a/src/testdir/test_popup.vim +++ b/src/testdir/test_popup.vim @@ -910,7 +910,7 @@ func Test_popup_command_dump() " Set a timer to change a menu entry while it's displayed. The text should " not change but the command does. Making the screendump also verifies that - " "changed" shows up, which means the timer triggered + " "changed" shows up, which means the timer triggered. call term_sendkeys(buf, "/X\<CR>:call StartTimer() | popup PopUp\<CR>") call VerifyScreenDump(buf, 'Test_popup_command_04', {}) @@ -918,6 +918,15 @@ func Test_popup_command_dump() call term_sendkeys(buf, "jj\<CR>") call VerifyScreenDump(buf, 'Test_popup_command_05', {}) + call term_sendkeys(buf, "\<Esc>") + + " Add a window toolbar to the window and check the :popup menu position. + call term_sendkeys(buf, ":nnoremenu WinBar.TEST :\<CR>") + call term_sendkeys(buf, "/X\<CR>:popup PopUp\<CR>") + call VerifyScreenDump(buf, 'Test_popup_command_06', {}) + + call term_sendkeys(buf, "\<Esc>") + call StopVimInTerminal(buf) endfunc