# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1653051605 -7200
# Node ID 2d726d5a6405ec011236ff9205c732fd88fd7c1c
# Parent  59caeb5508acbf97e0b96bc31abfcfd3c32bc58e
patch 8.2.4984: dragging statusline fails for window with winbar

Commit: https://github.com/vim/vim/commit/6dab00aa5417f62f8c2c85c7c4ae871b4f1171f4
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Fri May 20 13:45:59 2022 +0100

    patch 8.2.4984: dragging statusline fails for window with winbar

    Problem:    Dragging statusline fails for window with winbar.
    Solution:   Fix off-by-one error. (closes https://github.com/vim/vim/issues/10448)

diff --git a/src/mouse.c b/src/mouse.c
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -1823,7 +1823,7 @@ retnomove:
 	if (dragwin != NULL)
 	{
 	    // Drag the status line
-	    count = row - dragwin->w_winrow - dragwin->w_height + 1
+	    count = row - W_WINROW(dragwin) - dragwin->w_height + 1
 							     - on_status_line;
 	    win_drag_status_line(dragwin, count);
 	    did_drag |= count;
diff --git a/src/testdir/test_winbar.vim b/src/testdir/test_winbar.vim
--- a/src/testdir/test_winbar.vim
+++ b/src/testdir/test_winbar.vim
@@ -161,4 +161,32 @@ func Test_winbar_not_visible_custom_stat
   call delete('XtestWinbarNotVisble')
 endfunction
 
+func Test_drag_statusline_with_winbar()
+  call SetupWinbar()
+  let save_mouse = &mouse
+  set mouse=a
+  set laststatus=2
+
+  call test_setmouse(&lines - 1, 1)
+  call feedkeys("\<LeftMouse>", 'xt')
+  call test_setmouse(&lines - 2, 1)
+  call feedkeys("\<LeftDrag>", 'xt')
+  call assert_equal(2, &cmdheight)
+
+  call test_setmouse(&lines - 2, 1)
+  call feedkeys("\<LeftMouse>", 'xt')
+  call test_setmouse(&lines - 3, 1)
+  call feedkeys("\<LeftDrag>", 'xt')
+  call assert_equal(3, &cmdheight)
+
+  call test_setmouse(&lines - 3, 1)
+  call feedkeys("\<LeftMouse>", 'xt')
+  call test_setmouse(&lines - 1, 1)
+  call feedkeys("\<LeftDrag>", 'xt')
+  call assert_equal(1, &cmdheight)
+
+  let &mouse = save_mouse
+  set laststatus&
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    4984,
+/**/
     4983,
 /**/
     4982,