aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.1.2213: popup_textprop tests fail

Browse Source 
Problem:    Popup_textprop tests fail.
Solution:   Adjust the column and line positioning.
This commit is contained in:
Bram Moolenaar
2019-10-24 22:12:54 +02:00
parent 3691f1ee72
commit aa1f04d092
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/popupwin.c
View File

@@ -1082,7 +1082,6 @@ popup_adjust_position(win_T *wp)
int org_leftoff = wp->w_popup_leftoff; int org_leftoff = wp->w_popup_leftoff;
int minwidth; int minwidth;
int wantline = wp->w_wantline; // adjusted for textprop int wantline = wp->w_wantline; // adjusted for textprop
int use_wantline = wantline != 0;
int wantcol = wp->w_wantcol; // adjusted for textprop int wantcol = wp->w_wantcol; // adjusted for textprop
int use_wantcol = wantcol != 0; int use_wantcol = wantcol != 0;
@@ -1097,15 +1096,6 @@ popup_adjust_position(win_T *wp)
if (wp->w_popup_last_curline != wp->w_cursor.lnum) if (wp->w_popup_last_curline != wp->w_cursor.lnum)
popup_highlight_curline(wp); popup_highlight_curline(wp);
// If no line was specified default to vertical centering.
if (wantline == 0)
center_vert = TRUE;
else if (wantline < 0)
// If "wantline" is negative it actually means zero.
wantline = 0;
if (wantcol < 0)
wantcol = 0;
if (wp->w_popup_prop_type > 0 && win_valid(wp->w_popup_prop_win)) if (wp->w_popup_prop_type > 0 && win_valid(wp->w_popup_prop_win))
{ {
win_T *prop_win = wp->w_popup_prop_win; win_T *prop_win = wp->w_popup_prop_win;
@@ -1159,6 +1149,19 @@ popup_adjust_position(win_T *wp)
else else
// left of the text // left of the text
wantcol = screen_scol + wantcol - 2; wantcol = screen_scol + wantcol - 2;
use_wantcol = TRUE;
}
else
{
// If no line was specified default to vertical centering.
if (wantline == 0)
center_vert = TRUE;
else if (wantline < 0)
// If "wantline" is negative it actually means zero.
wantline = 0;
if (wantcol < 0)
// If "wantcol" is negative it actually means zero.
wantcol = 0;
} }
if (wp->w_popup_pos == POPPOS_CENTER) if (wp->w_popup_pos == POPPOS_CENTER)
@@ -1169,8 +1172,8 @@ popup_adjust_position(win_T *wp)
} }
else else
{ {
if (use_wantline && (wp->w_popup_pos == POPPOS_TOPLEFT if (wantline > 0 && (wp->w_popup_pos == POPPOS_TOPLEFT
|| wp->w_popup_pos == POPPOS_TOPRIGHT)) || wp->w_popup_pos == POPPOS_TOPRIGHT))
{ {
wp->w_winrow = wantline - 1; wp->w_winrow = wantline - 1;
if (wp->w_winrow >= Rows) if (wp->w_winrow >= Rows)

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
2213,
/**/ /**/
2212, 2212,
/**/ /**/