tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1036 from ZyX-I/fix-1033 

Fix width used for tabline
This commit is contained in:
Nikolai Aleksandrovich Pavlov 2014-08-29 19:10:13 +04:00
parent e609bdf514 125f309724
commit 96a0af9090
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
powerline/renderers/vim.py
View File

@ -2,7 +2,7 @@
from __future__ import absolute_import, unicode_literals from __future__ import absolute_import, unicode_literals
from powerline.bindings.vim import vim_get_func, environ, current_tabpage from powerline.bindings.vim import vim_get_func, vim_getoption, environ, current_tabpage
from powerline.renderer import Renderer from powerline.renderer import Renderer
from powerline.colorscheme import ATTR_BOLD, ATTR_ITALIC, ATTR_UNDERLINE from powerline.colorscheme import ATTR_BOLD, ATTR_ITALIC, ATTR_UNDERLINE
from powerline.theme import Theme from powerline.theme import Theme
@ -108,7 +108,10 @@ class VimRenderer(Renderer):
) )
segment_info['tabnr'] = segment_info['tabpage'].number segment_info['tabnr'] = segment_info['tabpage'].number
segment_info['bufnr'] = segment_info['buffer'].number segment_info['bufnr'] = segment_info['buffer'].number
winwidth = segment_info['window'].width if is_tabline:
winwidth = int(vim_getoption('columns'))
else:
winwidth = segment_info['window'].width
statusline = super(VimRenderer, self).render( statusline = super(VimRenderer, self).render(
mode=mode, mode=mode,

14
tests/test_tabline.vim
View File

@ -23,7 +23,7 @@ tabonly!
try try
let result = eval(&tabline[2:]) let result = eval(&tabline[2:])
catch catch
call writefile(['Exception while evaluating &tabline', v:exception], 'message.fail') call writefile(['Exception while evaluating &tabline (2)', v:exception], 'message.fail')
cquit cquit
endtry endtry
@ -32,4 +32,16 @@ if result isnot# '%#Pl_240_5789784_235_2500134_NONE# 1 %#Pl_240_5789784_235_25
cquit cquit
endif endif
try
vsplit
let result = eval(&tabline[2:])
catch
call writefile(['Exception while evaluating &tabline (3)', v:exception], 'message.fail')
endtry
if result isnot# '%#Pl_240_5789784_235_2500134_NONE# 1 %#Pl_240_5789784_235_2500134_NONE#./%#Pl_244_8421504_235_2500134_bold#abc %#Pl_244_8421504_235_2500134_NONE# %#Pl_240_5789784_235_2500134_NONE#2 %#Pl_240_5789784_235_2500134_NONE#./%#Pl_244_8421504_235_2500134_bold#def %#Pl_235_2500134_240_5789784_NONE# %#Pl_250_12369084_240_5789784_NONE#./%#Pl_231_16777215_240_5789784_bold#ghi %#Pl_240_5789784_236_3158064_NONE# %#Pl_231_16777215_236_3158064_NONE#                                           %#Pl_252_13684944_236_3158064_NONE# %#Pl_235_2500134_252_13684944_bold# Bufs '
call writefile(['Unexpected tabline (3)', result], 'message.fail')
cquit
endif
qall! qall!