patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal window
Problem: Cursor is in the wrong line when using a WinBar in a Terminal
window.
Solution: Adjust the row number. (Christian Brabandt, closes #2362)
diff --git a/src/screen.c b/src/screen.c
index ce9b6e9..97f6988 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1176,6 +1176,11 @@
*/
if (term_update_window(wp) == OK)
{
+# ifdef FEAT_MENU
+ /* Draw the window toolbar, if there is one. */
+ if (winbar_height(wp) > 0)
+ redraw_win_toolbar(wp);
+# endif
wp->w_redr_type = 0;
return;
}
diff --git a/src/terminal.c b/src/terminal.c
index eca9f1b..039c8b2 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -2398,8 +2398,8 @@
else
pos.col = 0;
- screen_line(wp->w_winrow + pos.row, wp->w_wincol,
- pos.col, wp->w_width, FALSE);
+ screen_line(wp->w_winrow + pos.row + winbar_height(wp),
+ wp->w_wincol, pos.col, wp->w_width, FALSE);
}
term->tl_dirty_row_start = MAX_ROW;
term->tl_dirty_row_end = 0;
diff --git a/src/version.c b/src/version.c
index 24eef2e..c7240f1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1520,
+/**/
1519,
/**/
1518,