diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-10-27 20:37:35 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-10-27 20:37:35 +0100 |
commit | 1c329c04be2e95a3589a53f2978926e91b450cca (patch) | |
tree | 339efc67b38eb018df704b57e1d83690ace16e32 /src | |
parent | 5b418992cf254137fde2a14d7066fbea5afddb28 (diff) |
patch 8.1.2227: layout wrong if 'lines' changes while cmdline window is openv8.1.2227
Problem: Layout wrong if 'lines' changes while cmdline window is open.
Solution: Do not restore the window layout if 'lines' changed.
(closes #5130)
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/dumps/Test_cmdwin_restore_1.dump | 12 | ||||
-rw-r--r-- | src/testdir/dumps/Test_cmdwin_restore_2.dump | 12 | ||||
-rw-r--r-- | src/testdir/dumps/Test_cmdwin_restore_3.dump | 18 | ||||
-rw-r--r-- | src/testdir/test_cmdline.vim | 30 | ||||
-rw-r--r-- | src/version.c | 2 | ||||
-rw-r--r-- | src/window.c | 17 |
6 files changed, 86 insertions, 5 deletions
diff --git a/src/testdir/dumps/Test_cmdwin_restore_1.dump b/src/testdir/dumps/Test_cmdwin_restore_1.dump new file mode 100644 index 0000000000..8ac0295a04 --- /dev/null +++ b/src/testdir/dumps/Test_cmdwin_restore_1.dump @@ -0,0 +1,12 @@ +|0+0&#ffffff0| @73 +|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1| @11|T|o|p +|0+0&&| @73 +|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1| @11|T|o|p +|:+0#4040ff13&> +0#0000000&@73 +|~+0#4040ff13&| @73 +|~| @73 +|~| @73 +|~| @73 +|~| @73 +|[+3#0000000&|C|o|m@1|a|n|d| |L|i|n|e|]| @42|1|,|0|-|1| @9|A|l@1 +|:+0&&| @73 diff --git a/src/testdir/dumps/Test_cmdwin_restore_2.dump b/src/testdir/dumps/Test_cmdwin_restore_2.dump new file mode 100644 index 0000000000..ce0b2b5ba8 --- /dev/null +++ b/src/testdir/dumps/Test_cmdwin_restore_2.dump @@ -0,0 +1,12 @@ +>0+0&#ffffff0| @73 +|1| @73 +|[+3&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1| @11|T|o|p +|0+0&&| @73 +|1| @73 +|2| @73 +|3| @73 +|4| @73 +|5| @73 +|6| @73 +|[+1&&|N|o| |N|a|m|e|]| |[|+|]| @43|1|,|1| @11|T|o|p +| +0&&@74 diff --git a/src/testdir/dumps/Test_cmdwin_restore_3.dump b/src/testdir/dumps/Test_cmdwin_restore_3.dump new file mode 100644 index 0000000000..1cc0f3f401 --- /dev/null +++ b/src/testdir/dumps/Test_cmdwin_restore_3.dump @@ -0,0 +1,18 @@ +>0+0&#ffffff0| @73 +|1| @73 +|2| @73 +|3| @73 +|4| @73 +|5| @73 +|6| @73 +|7| @73 +|8| @73 +|9| @73 +|1|0| @72 +|1@1| @72 +|1|2| @72 +|1|3| @72 +|1|4| @72 +|1|5| @72 +|1|6| @72 +@57|1|,|1| @10|T|o|p| diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim index 57dff41673..3f73d3da34 100644 --- a/src/testdir/test_cmdline.vim +++ b/src/testdir/test_cmdline.vim @@ -768,6 +768,36 @@ func Test_cmdwin_bug() bw! endfunc +func Test_cmdwin_restore() + CheckScreendump + + let lines =<< trim [SCRIPT] + call setline(1, range(30)) + 2split + [SCRIPT] + call writefile(lines, 'XTest_restore') + + let buf = RunVimInTerminal('-S XTest_restore', {'rows': 12}) + call term_wait(buf, 100) + call term_sendkeys(buf, "q:") + call VerifyScreenDump(buf, 'Test_cmdwin_restore_1', {}) + + " normal restore + call term_sendkeys(buf, ":q\<CR>") + call VerifyScreenDump(buf, 'Test_cmdwin_restore_2', {}) + + " restore after setting 'lines' with one window + call term_sendkeys(buf, ":close\<CR>") + call term_sendkeys(buf, "q:") + call term_sendkeys(buf, ":set lines=18\<CR>") + call term_sendkeys(buf, ":q\<CR>") + call VerifyScreenDump(buf, 'Test_cmdwin_restore_3', {}) + + " clean up + call StopVimInTerminal(buf) + call delete('XTest_restore') +endfunc + func Test_buffers_lastused() " check that buffers are sorted by time when wildmode has lastused call test_settime(1550020000) " middle diff --git a/src/version.c b/src/version.c index f5bc809aca..7b4ebe6b56 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2227, +/**/ 2226, /**/ 2225, diff --git a/src/window.c b/src/window.c index 8bb3269a0f..abdbd50796 100644 --- a/src/window.c +++ b/src/window.c @@ -5177,17 +5177,23 @@ win_size_save(garray_T *gap) win_T *wp; ga_init2(gap, (int)sizeof(int), 1); - if (ga_grow(gap, win_count() * 2) == OK) + if (ga_grow(gap, win_count() * 2 + 1) == OK) + { + // first entry is value of 'lines' + ((int *)gap->ga_data)[gap->ga_len++] = Rows; + FOR_ALL_WINDOWS(wp) { ((int *)gap->ga_data)[gap->ga_len++] = wp->w_width + wp->w_vsep_width; ((int *)gap->ga_data)[gap->ga_len++] = wp->w_height; } + } } /* - * Restore window sizes, but only if the number of windows is still the same. + * Restore window sizes, but only if the number of windows is still the same + * and 'lines' didn't change. * Does not free the growarray. */ void @@ -5196,13 +5202,14 @@ win_size_restore(garray_T *gap) win_T *wp; int i, j; - if (win_count() * 2 == gap->ga_len) + if (win_count() * 2 + 1 == gap->ga_len + && ((int *)gap->ga_data)[0] == Rows) { /* The order matters, because frames contain other frames, but it's * difficult to get right. The easy way out is to do it twice. */ for (j = 0; j < 2; ++j) { - i = 0; + i = 1; FOR_ALL_WINDOWS(wp) { frame_setwidth(wp->w_frame, ((int *)gap->ga_data)[i++]); @@ -6374,7 +6381,7 @@ min_rows(void) } /* - * Return TRUE if there is only one window (in the current tab page), not + * Return TRUE if there is only one window and only one tab page, not * counting a help or preview window, unless it is the current window. * Does not count unlisted windows. */ |