Mercurial > vim
changeset 17245:13a2d3364b3f v8.1.1622
patch 8.1.1622: wrong width if displaying a lot of lines in a popup window
commit https://github.com/vim/vim/commit/e296e3177b67bdcaa8b1f144d2495b9413e7055c
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Jul 3 23:20:18 2019 +0200
patch 8.1.1622: wrong width if displaying a lot of lines in a popup window
Problem: Wrong width if displaying a lot of lines in a popup window.
Solution: Accurately compute the line overflow.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 03 Jul 2019 23:30:07 +0200 |
| parents | dbfac1327a2e |
| children | a437ebad37b8 |
| files | src/popupwin.c src/testdir/dumps/Test_popupwin_firstline.dump src/testdir/test_popupwin.vim src/version.c |
| diffstat | 4 files changed, 21 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/popupwin.c +++ b/src/popupwin.c @@ -855,8 +855,8 @@ popup_adjust_position(win_T *wp) if (wp->w_width < len) wp->w_width = len; // do not use the width of lines we're not going to show - if (wp->w_maxheight > 0 && wp->w_buffer->b_ml.ml_line_count - - wp->w_topline + 1 + wrapped > wp->w_maxheight) + if (wp->w_maxheight > 0 + && lnum - wp->w_topline + 1 + wrapped > wp->w_maxheight) break; }
--- a/src/testdir/dumps/Test_popupwin_firstline.dump +++ b/src/testdir/dumps/Test_popupwin_firstline.dump @@ -1,10 +1,10 @@ >1+0&#ffffff0| @73 |2| @73 |3| @73 -|4| @33|3+0#0000001#ffd7ff255@4| +0#0000000#a8a8a8255| +0&#ffffff0@33 -|5| @33|4+0#0000001#ffd7ff255@1| @2| +0#0000000#0000001| +0&#ffffff0@33 -|6| @33|5+0#0000001#ffd7ff255| @3| +0#0000000#0000001| +0&#ffffff0@33 -|7| @33|6+0#0000001#ffd7ff255@4| +0#0000000#a8a8a8255| +0&#ffffff0@33 +|4| @32|3+0#0000001#ffd7ff255@4| | +0#0000000#a8a8a8255| +0&#ffffff0@33 +|5| @32|4+0#0000001#ffd7ff255@1| @3| +0#0000000#0000001| +0&#ffffff0@33 +|6| @32|5+0#0000001#ffd7ff255| @4| +0#0000000#0000001| +0&#ffffff0@33 +|7| @32|6+0#0000001#ffd7ff255@5| +0#0000000#a8a8a8255| +0&#ffffff0@33 |8| @73 |9| @73 @57|1|,|1| @10|T|o|p|
--- a/src/testdir/test_popupwin.vim +++ b/src/testdir/test_popupwin.vim @@ -1697,3 +1697,16 @@ func Test_popupwin_with_buffer() redraw call popup_close(winid) endfunc + +func Test_popupwin_width() + let winid = popup_create(repeat(['short', 'long long long line', 'medium width'], 50), { + \ 'maxwidth': 40, + \ 'maxheight': 10, + \ }) + for top in range(1, 20) + call popup_setoptions(winid, {'firstline': top}) + redraw + call assert_equal(19, popup_getpos(winid).width) + endfor + call popup_clear() +endfunc