Skip to content

Commit

Permalink
patch 8.1.1442: popup windows not considered when the Vim window is r…
Browse files Browse the repository at this point in the history
…esized

Problem:    Popup windows not considered when the Vim window is resized.
            (Ben Jackson)
Solution:   Reallocate the w_lines structure. (closes #4467)
  • Loading branch information
brammool committed Jun 1, 2019
1 parent bf0eff0 commit 8caaf82
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 0 deletions.
27 changes: 27 additions & 0 deletions src/screen.c
Expand Up @@ -8892,6 +8892,15 @@ screenalloc(int doclear)
win_free_lsize(wp);
if (aucmd_win != NULL)
win_free_lsize(aucmd_win);
#ifdef FEAT_TEXT_PROP
// global popup windows
for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
win_free_lsize(wp);
// tab-local popup windows
FOR_ALL_TABPAGES(tp)
for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next)
win_free_lsize(wp);
#endif

new_ScreenLines = LALLOC_MULT(schar_T, (Rows + 1) * Columns);
vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO);
Expand Down Expand Up @@ -8920,6 +8929,24 @@ screenalloc(int doclear)
if (aucmd_win != NULL && aucmd_win->w_lines == NULL
&& win_alloc_lines(aucmd_win) == FAIL)
outofmem = TRUE;
#ifdef FEAT_TEXT_PROP
// global popup windows
for (wp = first_popupwin; wp != NULL; wp = wp->w_next)
if (win_alloc_lines(wp) == FAIL)
{
outofmem = TRUE;
goto give_up;
}
// tab-local popup windows
FOR_ALL_TABPAGES(tp)
for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next)
if (win_alloc_lines(wp) == FAIL)
{
outofmem = TRUE;
goto give_up;
}
#endif

give_up:

for (i = 0; i < p_mco; ++i)
Expand Down
2 changes: 2 additions & 0 deletions src/version.c
Expand Up @@ -767,6 +767,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1442,
/**/
1441,
/**/
Expand Down

0 comments on commit 8caaf82

Please sign in to comment.