Merge branch 'skywind3000:master' into master

Author: VimWei

README.md

@@ -254,13 +254,13 @@ Available options:
 | g:navigator_max_height | max_height | `20` | maximum horizontal window height |
 | g:navigator_min_height | min_height | `5` | minimal horizontal window height |
 | g:navigator_max_width | max_width | `60` | maxmum vertical window width |
-| g:navigator_max_width | max_width | `20` | minimal vertical window width |
+| g:navigator_min_width | min_width | `20` | minimal vertical window width |
 | g:navigator_popup | popup | `0` | set to 1 to use popup or floatwin if available |
 | g:navigator_popup_position | popup_position | `'bottom'` | can be set to `'bottom'`, `'top'`, and `'center'` |
 | g:navigator_popup_width | popup_width | `'60%'` | centered popup window width |
-| g:navigator_popup_height | popup_height | `'40%'` | centered popup window height |
+| g:navigator_popup_height | popup_height | `'20%'` | centered popup window height |
 | g:navigator_popup_border | popup_border | `1` | centered popup window border, set to 0 for borderless window, and 2-4 for unicode border |
-| g:navigator_char_display | popup_border | `{}` | change display char like `{'<bar>': '\|', '<bslash>': '\'}` |
+| g:navigator_char_display | char_display | `{}` | change display char like `{'<bar>': '\|', '<bslash>': '\'}` |
 
 Global options can be directly defined like:
 
@@ -275,8 +275,8 @@ let g:my_keymap.config = {
     \ 'icon_separator': '→',
     \ 'popup': 1,
     \ 'popup_position': 'center',
-    \ 'popup_width': 40,
-    \ 'popup_height': 5,
+    \ 'popup_width': '60%',
+    \ 'popup_height': '20%',
     \ }
 ```
 

autoload/navigator/config.vim

@@ -332,6 +332,26 @@ function! navigator#config#init(opts) abort
 			endif
 		endif
 	endif
+	let opts.min_width = navigator#config#get(opts, 'min_width')
+	let opts.max_width = navigator#config#get(opts, 'max_width')
+	let opts.min_height = navigator#config#get(opts, 'min_height')
+	let opts.max_height = navigator#config#get(opts, 'max_height')
+	let opts.min_width = navigator#config#atoi(opts.min_width, &columns)
+	let opts.max_width = navigator#config#atoi(opts.max_width, &columns)
+	let opts.min_height = navigator#config#atoi(opts.min_height, &lines)
+	let opts.max_height = navigator#config#atoi(opts.max_height, &lines)
+	if opts.min_width > opts.max_width
+		let opts.min_width = opts.max_width
+	endif
+	if opts.min_height > opts.max_height
+		let opts.min_height = opts.max_height
+	endif
+	if opts.popup_position == 'center' && opts.popup != 0
+		let opts.min_width = opts.popup_width
+		let opts.max_width = opts.popup_width
+		let opts.min_height = opts.popup_height
+		let opts.max_height = opts.popup_height
+	endif
 	return opts
 endfunc
 

autoload/navigator/layout.vim

@@ -40,6 +40,9 @@ function! s:layout_horizon(ctx, opts) abort
 	endif
 	let min_height = navigator#config#get(a:opts, 'min_height')
 	let max_height = navigator#config#get(a:opts, 'max_height')
+	if min_height > max_height
+		let min_height = max_height
+	endif
 	let ypad = padding[1] + padding[3]
 	let min_height -= ypad
 	let max_height -= ypad
@@ -79,6 +82,9 @@ function! s:layout_vertical(ctx, opts) abort
 	let ctx.pg_size = ctx.pg_height
 	let min_width = navigator#config#get(a:opts, 'min_width')
 	let max_width = navigator#config#get(a:opts, 'max_width')
+	if min_width > max_width
+		let min_width = max_width
+	endif
 	let ctx.cx = (ctx.cx < min_width)? min_width : ctx.cx
 	let ctx.cx = (ctx.cx > max_width)? max_width : ctx.cx
 	let ctx.pages = []