patch 8.1.1666: click in popup window scrollbar with border doesn't scroll

Problem:    Click in popup window scrollbar with border doesn't scroll.
Solution:   Correct column for the border. (Naruhiko Nishino, closes #4650)

diff --git a/src/popupwin.c b/src/popupwin.c
index 968f6eeda42714700f7b958b5efbecb7b0169afc..aa19a5d63d6cba94849d601fb302a19be3100758 100644 (file)
--- a/src/popupwin.c
+++ b/src/popupwin.c
@@ -317,7 +317,7 @@ popup_handle_scrollbar_click(win_T *wp, int row, int col)
        return;
     if (row >= wp->w_popup_border[0]
            && row < height - wp->w_popup_border[2]
-           && col == popup_width(wp) - 1)
+           && col == popup_width(wp) - wp->w_popup_border[1] - 1)
     {
        if (row >= height / 2)
        {

diff --git a/src/testdir/dumps/Test_popupwin_scroll_9.dump b/src/testdir/dumps/Test_popupwin_scroll_9.dump
index d2b7134bfe6f46d6846fe66bbb2c077be1ca1aea..b471dc1bda8f49f66e4f72a3319a1d44bf9673fb 100644 (file)
--- a/src/testdir/dumps/Test_popupwin_scroll_9.dump
+++ b/src/testdir/dumps/Test_popupwin_scroll_9.dump
@@ -1,10 +1,10 @@
 >1+0&#ffffff0| @73
 |2| @73
-|3| @73
-|4| @31|f+0#0000001#ffd7ff255|i|v|e| @3| +0#0000000#ff404010| +0&#ffffff0@32
-|5| @31|s+0#0000001#ffd7ff255|i|x| @4| +0#0000000#ff404010| +0&#ffffff0@32
-|6| @31|s+0#0000001#ffd7ff255|e|v|e|n| @2| +0#0000000#4040ff13| +0&#ffffff0@32
-|7| @31|e+0#0000001#ffd7ff255|i|g|h|t| @2| +0#0000000#4040ff13| +0&#ffffff0@32
-|8| @73
+|3| @30|╔+0#0000001#ffd7ff255|═@8|X| +0#0000000#ffffff0@31
+|4| @30|║+0#0000001#ffd7ff255|f|i|v|e| @3| +0#0000000#ff404010|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@31
+|5| @30|║+0#0000001#ffd7ff255|s|i|x| @4| +0#0000000#ff404010|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@31
+|6| @30|║+0#0000001#ffd7ff255|s|e|v|e|n| @2| +0#0000000#4040ff13|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@31
+|7| @30|║+0#0000001#ffd7ff255|e|i|g|h|t| @2| +0#0000000#4040ff13|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@31
+|8| @30|╚+0#0000001#ffd7ff255|═@8|╝| +0#0000000#ffffff0@31
 |9| @73
 |:|c|a|l@1| |C|l|i|c|k|B|o|t|(|)| @40|1|,|1| @10|T|o|p| 

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 104ebd57d90ff8169729bd53c21ee209a509cacf..1a39d284f6d6147223c7d9aeb0b9a678d4890222 100644 (file)
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -1580,6 +1580,7 @@ func Test_popup_scrollbar()
       call feedkeys("\<F4>\<LeftMouse>", "xt")
     endfunc
     func ClickBot()
+      call popup_setoptions(g:winid, {'border': [], 'close': 'button'})
       call feedkeys("\<F5>\<LeftMouse>", "xt")
     endfunc
     map <silent> <F3> :call test_setmouse(5, 36)<CR>

diff --git a/src/version.c b/src/version.c
index 9d012bd2d34137b305c8bc0733fa111e544380ae..f274cef13420572c6d1b7e7620e729adceebc46e 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 */
+/**/
+    1666,
 /**/
     1665,
 /**/