aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-11-09 10:37:17 -05:00
Code Activity

patch 8.1.1945: popup window "firstline" cannot be reset

Browse Source 
Problem:    Popup window "firstline" cannot be reset.
Solution:   Allow for setting "firstline" to zero.  Fix that the text jumps to
            the top when using win_execute(). (closes #4876)
This commit is contained in:
Bram Moolenaar
2019-08-30 17:34:08 +02:00
parent 821d771e86
commit 9e67b6a6a1
5 changed files with 52 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/popupwin.c
View File

@@ -610,8 +610,8 @@ apply_general_options(win_T *wp, dict_T *dict)
di = dict_find(dict, (char_u *)"firstline", -1);
if (di != NULL)
wp->w_firstline = dict_get_number(dict, (char_u *)"firstline");
if (wp->w_firstline < 1)
wp->w_firstline = 1;
if (wp->w_firstline < 0)
wp->w_firstline = 0;
di = dict_find(dict, (char_u *)"scrollbar", -1);
if (di != NULL)
@@ -3192,8 +3192,17 @@ update_popups(void (*win_update)(win_T *wp))
// Draw the popup text, unless it's off screen.
if (wp->w_winrow < screen_Rows && wp->w_wincol < screen_Columns)
{
win_update(wp);
// move the cursor into the visible lines, otherwise executing
// commands with win_execute() may cause the text to jump.
if (wp->w_cursor.lnum < wp->w_topline)
wp->w_cursor.lnum = wp->w_topline;
else if (wp->w_cursor.lnum >= wp->w_botline)
wp->w_cursor.lnum = wp->w_botline - 1;
}
wp->w_winrow -= top_off;
wp->w_wincol -= left_extra;