thac0/vim
1
0
Fork 0
forked from aniani/vim
Code

patch 8.1.1678: using popup_menu() does not scroll to show the selected line

Browse Source 
Problem:    When using popup_menu() does not scroll to show the selected line.
Solution:   Scroll the text. (Naruhiko Nishino, closes #4651)
This commit is contained in:
Bram Moolenaar 2019-07-13 16:38:50 +02:00
parent b073da8929
commit a901a37bae
9 changed files with 114 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/popupwin.c
View File

@ -1512,6 +1512,12 @@ popup_highlight_curline(win_T *wp)
match_delete(wp, 1, FALSE); match_delete(wp, 1, FALSE);
// Scroll to show the line with the cursor. This assumes lines don't wrap.
while (wp->w_topline + wp->w_height - 1 < wp->w_cursor.lnum)
wp->w_topline++;
while (wp->w_cursor.lnum < wp->w_topline)
wp->w_topline--;
id = syn_name2id((char_u *)"PopupSelected"); id = syn_name2id((char_u *)"PopupSelected");
vim_snprintf(buf, sizeof(buf), "\\%%%dl.*", (int)wp->w_cursor.lnum); vim_snprintf(buf, sizeof(buf), "\\%%%dl.*", (int)wp->w_cursor.lnum);
match_add(wp, (char_u *)(id == 0 ? "PmenuSel" : "PopupSelected"), match_add(wp, (char_u *)(id == 0 ? "PmenuSel" : "PopupSelected"),

10
src/testdir/dumps/Test_popupwin_menu_scroll_1.dump Normal file
View File

@ -0,0 +1,10 @@
>1+0&#ffffff0| @73
|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
|3| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|4| @29|║+0#0000001#ffd7ff255| |o|n|e| @5| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|5| @29|║+0#0000001#ffd7ff255| |t+0&#e0e0e08|w|o| +0&#ffd7ff255@5| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|6| @29|║+0#0000001#ffd7ff255| |t|h|r|e@1| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|7| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
|9| @73
@57|1|,|1| @10|T|o|p|

10
src/testdir/dumps/Test_popupwin_menu_scroll_2.dump Normal file
View File

@ -0,0 +1,10 @@
>1+0&#ffffff0| @73
|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
|3| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|4| @29|║+0#0000001#ffd7ff255| |t|h|r|e@1| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|5| @29|║+0#0000001#ffd7ff255| |f|o|u|r| @4| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|6| @29|║+0#0000001#ffd7ff255| |f+0&#e0e0e08|i|v|e| +0&#ffd7ff255@4| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|7| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
|9| @73
@57|1|,|1| @10|T|o|p|

10
src/testdir/dumps/Test_popupwin_menu_scroll_3.dump Normal file
View File

@ -0,0 +1,10 @@
>1+0&#ffffff0| @73
|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
|3| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|4| @29|║+0#0000001#ffd7ff255| |s|e|v|e|n| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|5| @29|║+0#0000001#ffd7ff255| |e|i|g|h|t| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|6| @29|║+0#0000001#ffd7ff255| |n+0&#e0e0e08|i|n|e| +0&#ffd7ff255@4| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|7| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
|9| @73
@57|1|,|1| @10|T|o|p|

10
src/testdir/dumps/Test_popupwin_menu_scroll_4.dump Normal file
View File

@ -0,0 +1,10 @@
>1+0&#ffffff0| @73
|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
|3| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|4| @29|║+0#0000001#ffd7ff255| |s+0&#e0e0e08|e|v|e|n| +0&#ffd7ff255@3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|5| @29|║+0#0000001#ffd7ff255| |e|i|g|h|t| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|6| @29|║+0#0000001#ffd7ff255| |n|i|n|e| @4| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|7| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
|9| @73
@57|1|,|1| @10|T|o|p|

10
src/testdir/dumps/Test_popupwin_menu_scroll_5.dump Normal file
View File

@ -0,0 +1,10 @@
>1+0&#ffffff0| @73
|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
|3| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|4| @29|║+0#0000001#ffd7ff255| |s+0&#e0e0e08|i|x| +0&#ffd7ff255@5| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|5| @29|║+0#0000001#ffd7ff255| |s|e|v|e|n| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|6| @29|║+0#0000001#ffd7ff255| |e|i|g|h|t| @3| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|7| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
|9| @73
@57|1|,|1| @10|T|o|p|

10
src/testdir/dumps/Test_popupwin_menu_scroll_6.dump Normal file
View File

@ -0,0 +1,10 @@
>1+0&#ffffff0| @73
|2| @29|╔+0#0000001#ffd7ff255|═@10|╗| +0#0000000#ffffff0@30
|3| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|4| @29|║+0#0000001#ffd7ff255| |o+0&#e0e0e08|n|e| +0&#ffd7ff255@5| +0#0000000#0000001|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|5| @29|║+0#0000001#ffd7ff255| |t|w|o| @5| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|6| @29|║+0#0000001#ffd7ff255| |t|h|r|e@1| @3| +0#0000000#a8a8a8255|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@30
|7| @29|║+0#0000001#ffd7ff255| @10|║| +0#0000000#ffffff0@30
|8| @29|╚+0#0000001#ffd7ff255|═@10|╝| +0#0000000#ffffff0@30
|9| @73
@57|1|,|1| @10|T|o|p|

46
src/testdir/test_popupwin.vim
View File

@ -1861,4 +1861,50 @@ func Test_popup_menu_with_maxwidth()
call delete('XtestPopupMenuMaxWidth') call delete('XtestPopupMenuMaxWidth')
endfunc endfunc
func Test_popup_menu_with_scrollbar()
if !CanRunVimInTerminal()
throw 'Skipped: cannot make screendumps'
endif
let lines =<< trim END
call setline(1, range(1, 20))
hi ScrollThumb ctermbg=blue
hi ScrollBar ctermbg=red
call popup_menu(['one', 'two', 'three', 'four', 'five',
\ 'six', 'seven', 'eight', 'nine'], {
\ 'minwidth': 8,
\ 'maxheight': 3,
\ })
END
call writefile(lines, 'XtestPopupMenuScroll')
let buf = RunVimInTerminal('-S XtestPopupMenuScroll', {'rows': 10})
call term_sendkeys(buf, "j")
call VerifyScreenDump(buf, 'Test_popupwin_menu_scroll_1', {})
call term_sendkeys(buf, "jjj")
call VerifyScreenDump(buf, 'Test_popupwin_menu_scroll_2', {})
" if the cursor is the bottom line, it stays at the bottom line.
call term_sendkeys(buf, repeat("j", 20))
call VerifyScreenDump(buf, 'Test_popupwin_menu_scroll_3', {})
call term_sendkeys(buf, "kk")
call VerifyScreenDump(buf, 'Test_popupwin_menu_scroll_4', {})
call term_sendkeys(buf, "k")
call VerifyScreenDump(buf, 'Test_popupwin_menu_scroll_5', {})
" if the cursor is in the top line, it stays in the top line.
call term_sendkeys(buf, repeat("k", 20))
call VerifyScreenDump(buf, 'Test_popupwin_menu_scroll_6', {})
" close the menu popupwin.
call term_sendkeys(buf, " ")
" clean up
call StopVimInTerminal(buf)
call delete('XtestPopupMenuScroll')
endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

2
src/version.c
View File

@ -777,6 +777,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1678,
/**/ /**/
1677, 1677,
/**/ /**/