diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-30 21:19:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-30 21:19:26 +0200 |
| commit | 8edf0e31323a4293524f51f2960f4f3064309526 (patch) | |
| tree | 7bca50e2027acd0a2728cb2bece5a5703d6d78be | |
| parent | 8c8b88d0ccb7204bb829669885c2e886b7f483bf (diff) | |
patch 8.1.1779: not showing the popup window right border is confusingv8.1.1779
Problem: Not showing the popup window right border is confusing.
Solution: Also show the border when 'wrap' is off. (closes #4747)
| -rw-r--r-- | src/popupwin.c | 4 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_popupwin_20.dump | 2 | ||||
| -rw-r--r-- | src/testdir/dumps/Test_popupwin_21.dump | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/src/popupwin.c b/src/popupwin.c index 4113b55679..856409798a 100644 --- a/src/popupwin.c +++ b/src/popupwin.c @@ -1076,7 +1076,9 @@ popup_adjust_position(win_T *wp) } } - if (wp->w_p_wrap) + if (wp->w_p_wrap || (!wp->w_popup_fixed + && (wp->w_popup_pos == POPPOS_TOPLEFT + || wp->w_popup_pos == POPPOS_BOTLEFT))) { int want_col = 0; diff --git a/src/testdir/dumps/Test_popupwin_20.dump b/src/testdir/dumps/Test_popupwin_20.dump index 39ae7379b3..affe148cca 100644 --- a/src/testdir/dumps/Test_popupwin_20.dump +++ b/src/testdir/dumps/Test_popupwin_20.dump @@ -8,7 +8,7 @@ |8| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@12||+0#0000001#ffd7ff255| @2|w|r|a|p@1|e|d| |l|o|n|g|e|r| |t|e| @2|| |9+0#0000000#ffffff0| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@12||+0#0000001#ffd7ff255| @2|x|t| @17|| |1+0#0000000#ffffff0|0| @72 -|1@1| @50||+0#0000001#ffd7ff255| @2|r|i|g|h|t| |a|l|i|g|n|e|d| |t|e|x|t +|1@1| @46||+0#0000001#ffd7ff255| @2|r|i|g|h|t| |a|l|i|g|n|e|d| |t|e|x|t| @2|| |1+0#0000000#ffffff0|2| @72 |1|3| @72 |1|4| @72 diff --git a/src/testdir/dumps/Test_popupwin_21.dump b/src/testdir/dumps/Test_popupwin_21.dump index 56d8d14b16..7c2718dde7 100644 --- a/src/testdir/dumps/Test_popupwin_21.dump +++ b/src/testdir/dumps/Test_popupwin_21.dump @@ -8,7 +8,7 @@ |8| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@12|║+0#0000001#ffd7ff255| @2|w|r|a|p@1|e|d| |l|o|n|g|e|r| |t|e| @2|║ |9+0#0000000#ffffff0| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@12|║+0#0000001#ffd7ff255| @2|x|t| @17|║ |1+0#0000000#ffffff0|0| @72 -|1@1| @50|║+0#0000001#ffd7ff255| @2|r|i|g|h|t| |a|l|i|g|n|e|d| |t|e|x|t +|1@1| @46|║+0#0000001#ffd7ff255| @2|r|i|g|h|t| |a|l|i|g|n|e|d| |t|e|x|t| @2|║ |1+0#0000000#ffffff0|2| @72 |1|3| @72 |1|4| @72 diff --git a/src/version.c b/src/version.c index 4ae1905eef..463456b4c0 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1779, +/**/ 1778, /**/ 1777, |