aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.1496: popup window height is not recomputed

Browse Source 
Problem:    Popup window height is not recomputed.
Solution:   Recompute the height when needed.
This commit is contained in:
Bram Moolenaar
2019-06-08 17:15:51 +02:00
parent 1748c7f77e
commit acc682bd7c
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/popupwin.c
View File

@@ -541,8 +541,7 @@ popup_adjust_position(win_T *wp)
wp->w_wincol = wp->w_wantcol - (wp->w_width + extra_width); wp->w_wincol = wp->w_wantcol - (wp->w_width + extra_width);
} }
if (wp->w_height <= 1) wp->w_height = wp->w_buffer->b_ml.ml_line_count + wrapped;
wp->w_height = wp->w_buffer->b_ml.ml_line_count + wrapped;
if (wp->w_minheight > 0 && wp->w_height < wp->w_minheight) if (wp->w_minheight > 0 && wp->w_height < wp->w_minheight)
wp->w_height = wp->w_minheight; wp->w_height = wp->w_minheight;
if (wp->w_maxheight > 0 && wp->w_height > wp->w_maxheight) if (wp->w_maxheight > 0 && wp->w_height > wp->w_maxheight)
@@ -566,11 +565,13 @@ popup_adjust_position(win_T *wp)
wp->w_popup_last_changedtick = CHANGEDTICK(wp->w_buffer); wp->w_popup_last_changedtick = CHANGEDTICK(wp->w_buffer);
// Need to update popup_mask if the position or size changed. // Need to update popup_mask if the position or size changed.
// And redraw windows that were behind the popup.
if (org_winrow != wp->w_winrow if (org_winrow != wp->w_winrow
|| org_wincol != wp->w_wincol || org_wincol != wp->w_wincol
|| org_width != wp->w_width || org_width != wp->w_width
|| org_height != wp->w_height) || org_height != wp->w_height)
{ {
// TODO: redraw only windows that were below the popup.
redraw_all_later(NOT_VALID); redraw_all_later(NOT_VALID);
popup_mask_refresh = TRUE; popup_mask_refresh = TRUE;
} }

2
src/testdir/dumps/Test_popupwin_06.dump
View File

@@ -4,7 +4,7 @@
|~| @6|o+0#0000001#ffd7ff255|t|h|e|r| |t|a|b| @15| +0#4040ff13#ffffff0@41 |~| @6|o+0#0000001#ffd7ff255|t|h|e|r| |t|a|b| @15| +0#4040ff13#ffffff0@41
|~| @6|a+0#0000001#ffd7ff255| |c+0#ff404010&|o|m@1|e|n|t| +0#0000001&|l|i|n|e| @10| +0#4040ff13#ffffff0@41 |~| @6|a+0#0000001#ffd7ff255| |c+0#ff404010&|o|m@1|e|n|t| +0#0000001&|l|i|n|e| @10| +0#4040ff13#ffffff0@41
|~| @6|t+0#0000001#ffd7ff255|h|i|s| |l|i|n|e| |w|i|l@1| |n|o|t| |f|i|t| |h|e| +0#4040ff13#ffffff0@41 |~| @6|t+0#0000001#ffd7ff255|h|i|s| |l|i|n|e| |w|i|l@1| |n|o|t| |f|i|t| |h|e| +0#4040ff13#ffffff0@41
|~| @73 |~| @6|r+0#0000001#ffd7ff255|e| @22| +0#4040ff13#ffffff0@41
|~| @73 |~| @73
|~| @73 |~| @73
|:+0#0000000&|r|e|d|r|a|w| @49|0|,|0|-|1| @8|A|l@1| |:+0#0000000&|r|e|d|r|a|w| @49|0|,|0|-|1| @8|A|l@1|

2
src/version.c
View File

@@ -767,6 +767,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 */
/**/
1496,
/**/ /**/
1495, 1495,
/**/ /**/