aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 9.0.0190: the way 'cmdheight' can be made zero is inconsistent

Browse Source 
Problem:    The way 'cmdheight' can be made zero is inconsistent.
Solution:   Only make 'cmdheight' zero when setting it explicitly, not when
            resizing windows. (closes #10890)
This commit is contained in:
Bram Moolenaar
2022-08-11 13:17:30 +01:00
parent 87f3a2ca3d
commit f797e309ca
7 changed files with 78 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/window.c
View File

@@ -5702,7 +5702,7 @@ frame_setheight(frame_T *curfrp, int height)
if (curfrp->fr_parent == NULL)
{
// topframe: can only change the command line
// topframe: can only change the command line height
if (height > ROWS_AVAIL)
// If height is greater than the available space, try to create
// space for the frame by reducing 'cmdheight' if possible, while
@@ -6089,6 +6089,12 @@ win_drag_status_line(win_T *dragwin, int offset)
int row;
int up; // if TRUE, drag status line up, otherwise down
int n;
static int p_ch_was_zero = FALSE;
// If the user explicitly set 'cmdheight' to zero, then allow for dragging
// the status line making it zero again.
if (p_ch == 0)
p_ch_was_zero = TRUE;
fr = dragwin->w_frame;
curfr = fr;
@@ -6147,6 +6153,8 @@ win_drag_status_line(win_T *dragwin, int offset)
room = Rows - cmdline_row;
if (curfr->fr_next != NULL)
room -= p_ch;
else if (!p_ch_was_zero)
--room;
if (room < 0)
room = 0;
// sum up the room of frames below of the current one
@@ -6196,7 +6204,7 @@ win_drag_status_line(win_T *dragwin, int offset)
row = win_comp_pos();
screen_fill(row, cmdline_row, 0, (int)Columns, ' ', ' ', 0);
cmdline_row = row;
p_ch = MAX(Rows - cmdline_row, 0);
p_ch = MAX(Rows - cmdline_row, p_ch_was_zero ? 0 : 1);
curtab->tp_ch_used = p_ch;
redraw_all_later(SOME_VALID);
showmode();
@@ -6542,6 +6550,11 @@ command_height(void)
// p_ch was changed in another tab page.
curtab->tp_ch_used = p_ch;
// If the space for the command line is already more than 'cmdheight' there
// is nothing to do (window size must have decreased).
if (p_ch > old_p_ch && cmdline_row <= Rows - p_ch)
return;
// Find bottom frame with width of screen.
frp = lastwin->w_frame;
while (frp->fr_width != Columns && frp->fr_parent != NULL)