diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-02-13 21:19:21 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-02-13 21:19:21 +0100 |
| commit | 181ca99e163b145cd1a4ec47a50cc25cf3994109 (patch) | |
| tree | 29f4ee8addceac5667fbe06789247f750779b501 | |
| parent | 341a64c9cabff08e4a7dc8cd932a598e12134457 (diff) | |
| download | vim-git-181ca99e163b145cd1a4ec47a50cc25cf3994109.tar.gz | |
patch 8.0.1520: cursor in wrong line when using a WinBar in Terminal windowv8.0.1520
Problem: Cursor is in the wrong line when using a WinBar in a Terminal
window.
Solution: Adjust the row number. (Christian Brabandt, closes #2362)
| -rw-r--r-- | src/screen.c | 5 | ||||
| -rw-r--r-- | src/terminal.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/screen.c b/src/screen.c index ce9b6e98e..97f69882b 100644 --- a/src/screen.c +++ b/src/screen.c @@ -1176,6 +1176,11 @@ win_update(win_T *wp) */ 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 eca9f1bd8..039c8b26b 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -2398,8 +2398,8 @@ term_update_window(win_T *wp) 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 24eef2e8a..c7240f1a6 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1520, +/**/ 1519, /**/ 1518, |