Llewellyn/fzf
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/fzf.git synced 2025-01-09 17:53:56 +00:00
Code Issues Projects Releases Wiki Activity

[vim] Disable height calculation when 'preview' is found in the option string

Browse Source 
Fix #2093

And we'll phase out height specification with `~` prefix.
This commit is contained in:
Junegunn Choi 2020-06-29 22:26:13 +09:00
parent 6dec42a33a
commit bdde69d011
No known key found for this signature in database
GPG Key ID: 254BC280FEF9C627
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README-VIM.md
View File

@ -128,7 +128,7 @@ let g:fzf_action = {
" Default fzf layout " Default fzf layout
" - down / up / left / right " - down / up / left / right
let g:fzf_layout = { 'down': '~40%' } let g:fzf_layout = { 'down': '40%' }
" You can set up fzf window using a Vim command (Neovim or latest Vim 8 required) " You can set up fzf window using a Vim command (Neovim or latest Vim 8 required)
let g:fzf_layout = { 'window': 'enew' } let g:fzf_layout = { 'window': 'enew' }
@ -416,7 +416,7 @@ When fzf starts in a terminal buffer, the file type of the buffer is set to
`fzf`. So you can set up `FileType fzf` autocmd to customize the settings of `fzf`. So you can set up `FileType fzf` autocmd to customize the settings of
the window. the window.
For example, if you use the default layout (`{'down': '~40%'}`) on Neovim, you For example, if you use the default layout (`{'down': '40%'}`) on Neovim, you
might want to temporarily disable the statusline for a cleaner look. might want to temporarily disable the statusline for a cleaner look.
```vim ```vim

3
plugin/fzf.vim
View File

@ -629,6 +629,9 @@ function! s:calc_size(max, val, dict)
endif endif
let opts = $FZF_DEFAULT_OPTS.' '.s:evaluate_opts(get(a:dict, 'options', '')) let opts = $FZF_DEFAULT_OPTS.' '.s:evaluate_opts(get(a:dict, 'options', ''))
if opts =~ 'preview'
return size
endif
let margin = match(opts, '--inline-info\|--info[^-]\{-}inline') > match(opts, '--no-inline-info\|--info[^-]\{-}\(default\|hidden\)') ? 1 : 2 let margin = match(opts, '--inline-info\|--info[^-]\{-}inline') > match(opts, '--no-inline-info\|--info[^-]\{-}\(default\|hidden\)') ? 1 : 2
let margin += stridx(opts, '--border') > stridx(opts, '--no-border') ? 2 : 0 let margin += stridx(opts, '--border') > stridx(opts, '--no-border') ? 2 : 0
if stridx(opts, '--header') > stridx(opts, '--no-header') if stridx(opts, '--header') > stridx(opts, '--no-header')