From 9e5134001d490e4651ed45e5bc93db06bf5be494 Mon Sep 17 00:00:00 2001
From: alanding <395577197@qq.com>
Date: Wed, 3 Apr 2019 12:49:01 +0800
Subject: [PATCH] Revert "change nvim floating window API in flygrep, guide"
 stay the same with spc This reverts commit
 2604904c8ecd866980920b53f46ae1cd922ae221.

---
 autoload/SpaceVim/mapping/guide.vim   | 16 ++++++----------
 autoload/SpaceVim/plugins/flygrep.vim | 16 +++++++---------
 2 files changed, 13 insertions(+), 19 deletions(-)

diff --git a/autoload/SpaceVim/mapping/guide.vim b/autoload/SpaceVim/mapping/guide.vim
index ca88f38b1..2aee9f476 100644
--- a/autoload/SpaceVim/mapping/guide.vim
+++ b/autoload/SpaceVim/mapping/guide.vim
@@ -392,13 +392,11 @@ function! s:start_buffer() abort " {{{
 
   setlocal modifiable
   if exists('*nvim_open_win')
-    call nvim_win_set_config(win_getid(s:gwin), 
+    call nvim_win_config(win_getid(s:gwin), &columns, layout.win_dim + 2, 
           \ {
           \ 'relative': 'editor',
-          \ 'width'   : &columns,
-          \ 'height'  : layout.win_dim + 2,
-          \ 'row'     : &lines - layout.win_dim - 4,
-          \ 'col'     : 0
+          \ 'row': &lines - layout.win_dim - 4,
+          \ 'col': 0
           \ })
 
   else
@@ -506,13 +504,11 @@ function! s:winopen() abort " {{{
     if !bufexists(s:bufnr)
       let s:bufnr = nvim_create_buf(v:false,v:false)
     endif
-    call nvim_open_win(s:bufnr, v:true,
+    call nvim_open_win(s:bufnr, v:true, &columns, 12,
           \ {
           \ 'relative': 'editor',
-          \ 'width'   : &columns,
-          \ 'height'  : 12,
-          \ 'row'     : &lines - 14,
-          \ 'col'     : 0
+          \ 'row': &lines - 14,
+          \ 'col': 0
           \ })
   else
     if bufexists(s:bufnr)
diff --git a/autoload/SpaceVim/plugins/flygrep.vim b/autoload/SpaceVim/plugins/flygrep.vim
index 00a408c25..b4cd0262f 100644
--- a/autoload/SpaceVim/plugins/flygrep.vim
+++ b/autoload/SpaceVim/plugins/flygrep.vim
@@ -599,13 +599,11 @@ function! SpaceVim#plugins#flygrep#open(agrv) abort
   if exists('*nvim_open_win')
     let s:buffer_id = nvim_create_buf(v:false, v:false)
     let flygrep_win_height = 16
-    let s:flygrep_win_id = nvim_open_win(s:buffer_id, v:true,
+    let s:flygrep_win_id = nvim_open_win(s:buffer_id, v:true, &columns, flygrep_win_height,
           \ {
           \ 'relative': 'editor',
-          \ 'width'   : &columns,
-          \ 'height'  : flygrep_win_height,
-          \ 'row'     : &lines - flygrep_win_height - 2,
-          \ 'col'     : 0
+          \ 'row': &lines - flygrep_win_height - 2,
+          \ 'col': 0
           \ })
   else
     noautocmd rightbelow split __flygrep__
@@ -678,12 +676,12 @@ function! s:create_statusline() abort
   let s:statusline_buf_id = nvim_create_buf(0,0)
   let s:statusline_win_id = nvim_open_win(s:statusline_buf_id,
         \ v:true,
+        \ &columns ,
+        \ 1,
         \ {
         \   'relative': 'editor',
-        \   'width'   : &columns,
-        \   'height'  : 1,
-        \   'row'     : &lines ,
-        \   'col'     : 10
+        \   'row': &lines ,
+        \   'col': 10
         \ })
   call setbufvar(s:statusline_buf_id, '&relativenumber', 0)
   call setbufvar(s:statusline_buf_id, '&number', 0)