mirror of
https://github.com/neovim/neovim.git
synced 2025-09-28 22:18:33 +00:00
Merge pull request #27872 from luukvbaal/cmdheight
fix(ui): don't force 'cmdheight' to zero with ext_messages
This commit is contained in:
@@ -227,6 +227,11 @@ void ui_refresh(void)
|
||||
if (i < kUIGlobalCount) {
|
||||
ext_widgets[i] |= ui_cb_ext[i];
|
||||
}
|
||||
// Set 'cmdheight' to zero when ext_messages becomes active.
|
||||
if (i == kUIMessages && !ui_ext[i] && ext_widgets[i]) {
|
||||
set_option_value(kOptCmdheight, NUMBER_OPTVAL(0), 0);
|
||||
command_height();
|
||||
}
|
||||
ui_ext[i] = ext_widgets[i];
|
||||
if (i < kUIGlobalCount) {
|
||||
ui_call_option_set(cstr_as_string(ui_ext_names[i]),
|
||||
@@ -241,10 +246,6 @@ void ui_refresh(void)
|
||||
screen_resize(width, height);
|
||||
p_lz = save_p_lz;
|
||||
|
||||
if (ext_widgets[kUIMessages]) {
|
||||
set_option_value(kOptCmdheight, NUMBER_OPTVAL(0), 0);
|
||||
command_height();
|
||||
}
|
||||
ui_mode_info_set();
|
||||
pending_mode_update = true;
|
||||
ui_cursor_shape();
|
||||
|
@@ -5899,10 +5899,6 @@ static void frame_setheight(frame_T *curfrp, int height)
|
||||
|
||||
if (curfrp->fr_parent == NULL) {
|
||||
// topframe: can only change the command line height
|
||||
// Avoid doing so with external messages.
|
||||
if (ui_has(kUIMessages)) {
|
||||
return;
|
||||
}
|
||||
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 making sure
|
||||
@@ -6241,12 +6237,6 @@ const char *did_set_winminwidth(optset_T *args FUNC_ATTR_UNUSED)
|
||||
void win_drag_status_line(win_T *dragwin, int offset)
|
||||
{
|
||||
frame_T *fr = dragwin->w_frame;
|
||||
|
||||
// Avoid changing command line height with external messages.
|
||||
if (fr->fr_next == NULL && ui_has(kUIMessages)) {
|
||||
return;
|
||||
}
|
||||
|
||||
frame_T *curfr = fr;
|
||||
if (fr != topframe) { // more than one window
|
||||
fr = fr->fr_parent;
|
||||
|
Reference in New Issue
Block a user