aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-08 06:04:08 -04:00
Code Activity

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

Browse Source 
Problem:    Click in popup window scrollbar with border doesn't scroll.
Solution:   Correct column for the border. (Naruhiko Nishino, closes #4650)
This commit is contained in:
Bram Moolenaar
2019-07-12 16:35:34 +02:00
parent b420747478
commit bd42b31780
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/popupwin.c
View File

@@ -317,7 +317,7 @@ popup_handle_scrollbar_click(win_T *wp, int row, int col)
return; return;
if (row >= wp->w_popup_border[0] if (row >= wp->w_popup_border[0]
&& row < height - wp->w_popup_border[2] && 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) if (row >= height / 2)
{ {

12
src/testdir/dumps/Test_popupwin_scroll_9.dump
View File

@@ -1,10 +1,10 @@
>1+0&#ffffff0| @73 >1+0&#ffffff0| @73
|2| @73 |2| @73
|3| @73 |3| @30|╔+0#0000001#ffd7ff255|═@8|X| +0#0000000#ffffff0@31
|4| @31|f+0#0000001#ffd7ff255|i|v|e| @3| +0#0000000#ff404010| +0&#ffffff0@32 |4| @30|║+0#0000001#ffd7ff255|f|i|v|e| @3| +0#0000000#ff404010|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@31
|5| @31|s+0#0000001#ffd7ff255|i|x| @4| +0#0000000#ff404010| +0&#ffffff0@32 |5| @30|║+0#0000001#ffd7ff255|s|i|x| @4| +0#0000000#ff404010|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@31
|6| @31|s+0#0000001#ffd7ff255|e|v|e|n| @2| +0#0000000#4040ff13| +0&#ffffff0@32 |6| @30|║+0#0000001#ffd7ff255|s|e|v|e|n| @2| +0#0000000#4040ff13|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@31
|7| @31|e+0#0000001#ffd7ff255|i|g|h|t| @2| +0#0000000#4040ff13| +0&#ffffff0@32 |7| @30|║+0#0000001#ffd7ff255|e|i|g|h|t| @2| +0#0000000#4040ff13|║+0#0000001#ffd7ff255| +0#0000000#ffffff0@31
|8| @73 |8| @30|╚+0#0000001#ffd7ff255|═@8|╝| +0#0000000#ffffff0@31
|9| @73 |9| @73
|:|c|a|l@1| |C|l|i|c|k|B|o|t|(|)| @40|1|,|1| @10|T|o|p| |:|c|a|l@1| |C|l|i|c|k|B|o|t|(|)| @40|1|,|1| @10|T|o|p|

1
src/testdir/test_popupwin.vim
View File

@@ -1580,6 +1580,7 @@ func Test_popup_scrollbar()
call feedkeys("\<F4>\<LeftMouse>", "xt") call feedkeys("\<F4>\<LeftMouse>", "xt")
endfunc endfunc
func ClickBot() func ClickBot()
call popup_setoptions(g:winid, {'border': [], 'close': 'button'})
call feedkeys("\<F5>\<LeftMouse>", "xt") call feedkeys("\<F5>\<LeftMouse>", "xt")
endfunc endfunc
map <silent> <F3> :call test_setmouse(5, 36)<CR> map <silent> <F3> :call test_setmouse(5, 36)<CR>

2
src/version.c
View File

@@ -777,6 +777,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 */
/**/
1666,
/**/ /**/
1665, 1665,
/**/ /**/