mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-06 09:56:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): always use stl/stlnc fillchars when drawing statusline (#25267)

Browse Source
This commit is contained in:
tj-moody
2023-09-23 22:49:47 -04:00
committed by GitHub
parent cfb898cd8a
commit 046c9a83f7
7 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/nvim/options.lua
View File

@@ -2790,8 +2790,8 @@ return {
and the value of that item:
item default Used for ~
stl ' ' or '^' statusline of the current window
stlnc ' ' or '=' statusline of the non-current windows
stl ' ' statusline of the current window
stlnc ' ' statusline of the non-current windows
wbr ' ' window bar
horiz '─' or '-' horizontal separators |:split|
horizup '┴' or '-' upwards facing horizontal separator
@@ -2810,9 +2810,7 @@ return {
eob '~' empty lines at the end of a buffer
lastline '@' 'display' contains lastline/truncate
Any one that is omitted will fall back to the default. For "stl" and
"stlnc" the space will be used when there is highlighting, '^' or '='
otherwise.
Any one that is omitted will fall back to the default.
Note that "horiz", "horizup", "horizdown", "vertleft", "vertright" and
"verthoriz" are only used when 'laststatus' is 3, since only vertical

13
src/nvim/statusline.c
View File

@@ -637,18 +637,7 @@ int fillchar_status(int *attr, win_T *wp)
*attr = win_hl_attr(wp, HLF_SNC);
fill = wp->w_p_fcs_chars.stlnc;
}
// Use fill when there is highlighting, and highlighting of current
// window differs, or the fillchars differ, or this is not the
// current window
if (*attr != 0 && ((win_hl_attr(wp, HLF_S) != win_hl_attr(wp, HLF_SNC)
|| !is_curwin || ONE_WINDOW)
|| (wp->w_p_fcs_chars.stl != wp->w_p_fcs_chars.stlnc))) {
return fill;
}
if (is_curwin) {
return '^';
}
return '=';
return fill;
}
/// Redraw the status line according to 'statusline' and take care of any