Gaze/SpaceVim
1
0
Fork 0
mirror of https://github.com/SpaceVim/SpaceVim.git synced 2025-01-24 05:30:07 +08:00
Code Issues Projects Releases Wiki Activity

Fix statusline for inactive window

Browse Source
This commit is contained in:
wsdjeg 2017-12-06 10:53:21 +08:00
parent 8faf056d4d
commit a12d2aae63
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
autoload/SpaceVim/api/vim/statusline.vim
View File

@ -15,6 +15,9 @@ function! s:self.len(sec) abort
endif
endfunction
function! s:self.eval(sec) abort
return substitute(a:sec, '%{.*}', '', 'g')
endfunction
function! s:self.build(left_sections, right_sections, lsep, rsep, fname, hi_a, hi_b, hi_c, hi_z, winwidth) abort
let l = '%#' . a:hi_a . '#' . a:left_sections[0]

40
autoload/SpaceVim/layers/core/statusline.vim
View File

@ -151,7 +151,7 @@ endfunction
function! s:date() abort
return ' ' . s:TIME.current_date() . ' '
endfunction
function! s:whitespace() abort
@ -313,6 +313,9 @@ function! s:filesize() abort
endfunction
function! SpaceVim#layers#core#statusline#get(...) abort
for nr in range(1, winnr('$'))
call setwinvar(nr, 'winwidth', winwidth(nr))
endfor
if &filetype ==# 'vimfiler'
return '%#SpaceVim_statusline_ia#' . s:winnr(1) . '%#SpaceVim_statusline_ia_SpaceVim_statusline_b#' . s:lsep
\ . '%#SpaceVim_statusline_b# vimfiler %#SpaceVim_statusline_b_SpaceVim_statusline_c#' . s:lsep
@ -380,21 +383,18 @@ endfunction
function! s:inactive() abort
let l = '%#SpaceVim_statusline_ia#' . s:winnr() . '%#SpaceVim_statusline_ia_SpaceVim_statusline_b#' . s:lsep . '%#SpaceVim_statusline_b#'
let lsec = [s:filename(), &filetype, s:modes(), s:git_branch(),]
let rsec = ['%{" " . &ff . "|" . (&fenc!=""?&fenc:&enc) . " "}', ' %P ']
let len = s:STATUSLINE.len(s:winnr()) + 5
let lt = []
let winwidth = winwidth(winnr())
for sec in lsec
if len + s:STATUSLINE.len(sec) < winwidth
call add(lt, sec)
let len = len + s:STATUSLINE.len(sec)
else
break
endif
let secs = [s:filename(), &filetype, s:modes(), s:git_branch()]
let base = 30
for sec in secs
let len = s:STATUSLINE.len(sec)
let base += len
let l .= '%{ get(w:, "winwidth", 150) < ' . base . ' ? "" : (" ' . s:STATUSLINE.eval(sec) . ' ' . s:ilsep . '")}'
endfor
return l . join(lt, s:ilsep) . s:ilsep . ' %='. s:irsep . join(rsec, s:irsep)
let l .= join(['%=', '%{" " . &ff . "|" . (&fenc!=""?&fenc:&enc) . " "}', ' %P '], s:irsep)
return l
endfunction
function! s:gitgutter() abort
if exists('b:gitgutter_summary')
let l:summary = get(b:, 'gitgutter_summary')
@ -620,12 +620,12 @@ endfunction
function! SpaceVim#layers#core#statusline#register_sections(name, func)
if has_key(s:registed_sections, a:name)
call SpaceVim#logger#info('statusline build-in section ' . a:name . ' has been changed!')
call extend(s:registed_sections, {a:name : a:func})
else
call extend(s:registed_sections, {a:name : a:func})
endif
if has_key(s:registed_sections, a:name)
call SpaceVim#logger#info('statusline build-in section ' . a:name . ' has been changed!')
call extend(s:registed_sections, {a:name : a:func})
else
call extend(s:registed_sections, {a:name : a:func})
endif
endfunction