patch 8.1.1778: not showing the popup window right border is confusing

Problem:    Not showing the popup window right border is confusing.
Solution:   Also show the border when there is no close button. (closes #4747)

diff --git a/src/popupwin.c b/src/popupwin.c
index a8d8a8593886db9561616ca01d36571a8f1a477a..4113b55679edb868bde52acd771bae87fa40c0ce 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -1080,13 +1080,8 @@ popup_adjust_position(win_T *wp)
     {
        int want_col = 0;
 
-       if (wp->w_popup_close == POPCLOSE_BUTTON)
-           // try to show the close button
-           want_col = left_extra + wp->w_width + right_extra;
-       else if (wp->w_has_scrollbar)
-           // try to show the scrollbar
-           want_col = left_extra + wp->w_width
-                                        + right_extra - wp->w_popup_border[1];
+       // try to show the right border and any scrollbar
+       want_col = left_extra + wp->w_width + right_extra;
        if (want_col > 0 && wp->w_wincol > 0
                                         && wp->w_wincol + want_col >= Columns)
        {

diff --git a/src/testdir/dumps/Test_popupwin_20.dump b/src/testdir/dumps/Test_popupwin_20.dump
index 14487ffb3e564d291abb68cbcdcd9c37210cbd6a..39ae7379b3e65b56815ccdb9274d3969dc097d76 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_20.dump
+++ b/src/testdir/dumps/Test_popupwin_20.dump
@@ -5,8 +5,8 @@
 |5| @40||+0#0000001#ffd7ff255| @11||| +0#0000000#ffffff0@18
 |6| |++0#0000001#ffd7ff255|-@8| +0#0000000#ffffff0@9| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@4|++0#0000001#ffd7ff255|-@11|+| +0#0000000#ffffff0@18
 |7| ||+0#0000001#ffd7ff255|b|o|r|d|e|r| |T|L| +0#0000000#ffffff0@9| +0#0000001#ffd7ff255@3|p|a|d@1|i|n|g|s| @2| +0#0000000#ffffff0@37
-|8| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@16||+0#0000001#ffd7ff255| @2|w|r|a|p@1|e|d| |l|o|n|g|e|r| |t|e
-|9+0#0000000#ffffff0| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@16||+0#0000001#ffd7ff255| @2|x|t| @14
+|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+0#0000000#ffffff0|2| @72

diff --git a/src/testdir/dumps/Test_popupwin_21.dump b/src/testdir/dumps/Test_popupwin_21.dump
index 4a32eaa4c01eac73a399e1769e4c9411d1a3e7ac..56d8d14b169cb9cbef29bdbbe6184ea82bc8d255 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_21.dump
+++ b/src/testdir/dumps/Test_popupwin_21.dump
@@ -5,8 +5,8 @@
 |5| @40|║+0#0000001#ffd7ff255| @11|║| +0#0000000#ffffff0@18
 |6| |╔+0#0000001#ffd7ff255|═@8| +0#0000000#ffffff0@9| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@4|╚+0#0000001#ffd7ff255|═@11|╝| +0#0000000#ffffff0@18
 |7| |║+0#0000001#ffd7ff255|b|o|r|d|e|r| |T|L| +0#0000000#ffffff0@9| +0#0000001#ffd7ff255@3|p|a|d@1|i|n|g|s| @2| +0#0000000#ffffff0@37
-|8| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@16|║+0#0000001#ffd7ff255| @2|w|r|a|p@1|e|d| |l|o|n|g|e|r| |t|e
-|9+0#0000000#ffffff0| @20| +0#0000001#ffd7ff255@14| +0#0000000#ffffff0@16|║+0#0000001#ffd7ff255| @2|x|t| @14
+|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+0#0000000#ffffff0|2| @72

diff --git a/src/version.c b/src/version.c
index 281e7e28ddd2464c87641a2ccbbb809894ac3fbd..4ae1905eef06031a20d942e6d4244a7313549904 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -777,6 +777,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1778,
 /**/
     1777,
 /**/