summaryrefslogtreecommitdiffstats
path: root/src/options.go
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2021-04-06 17:37:11 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2021-04-06 17:37:11 +0900
commit15f4cfb6d90915135454a1eee1e1c8198b184426 (patch)
tree5971939cde9a66d75257dc5008c5ae5a3310a5b3 /src/options.go
parentbe36de2482fd68d62abb3eac217ac7d8edecdb92 (diff)
More border optins for preview window
Close #2431
Diffstat (limited to 'src/options.go')
-rw-r--r--src/options.go26
1 files changed, 20 insertions, 6 deletions
diff --git a/src/options.go b/src/options.go
index 8d0afe06..bb134fa0 100644
--- a/src/options.go
+++ b/src/options.go
@@ -58,7 +58,7 @@ const usage = `usage: fzf [options]
--layout=LAYOUT Choose layout: [default|reverse|reverse-list]
--border[=STYLE] Draw border around the finder
[rounded|sharp|horizontal|vertical|
- top|bottom|left|right] (default: rounded)
+ top|bottom|left|right|none] (default: rounded)
--margin=MARGIN Screen margin (TRBL | TB,RL | T,RL,B | T,R,B,L)
--padding=PADDING Padding inside border (TRBL | TB,RL | T,RL,B | T,R,B,L)
--info=STYLE Finder info style [default|inline|hidden]
@@ -83,7 +83,7 @@ const usage = `usage: fzf [options]
--preview-window=OPT Preview window layout (default: right:50%)
[up|down|left|right][:SIZE[%]]
[:[no]wrap][:[no]cycle][:[no]follow][:[no]hidden]
- [:rounded|sharp|noborder]
+ [:border-BORDER_OPT]
[:+SCROLL[OFFSETS][/DENOM]][:~HEADER_LINES]
[:default]
@@ -436,11 +436,13 @@ func parseBorder(str string, optional bool) tui.BorderShape {
return tui.BorderLeft
case "right":
return tui.BorderRight
+ case "none":
+ return tui.BorderNone
default:
if optional && str == "" {
return tui.BorderRounded
}
- errorExit("invalid border style (expected: rounded|sharp|horizontal|vertical|top|bottom|left|right)")
+ errorExit("invalid border style (expected: rounded|sharp|horizontal|vertical|top|bottom|left|right|none)")
}
return tui.BorderNone
}
@@ -1105,12 +1107,24 @@ func parsePreviewWindow(opts *previewOpts, input string) {
opts.position = posLeft
case "right":
opts.position = posRight
- case "rounded", "border":
+ case "rounded", "border", "border-rounded":
opts.border = tui.BorderRounded
- case "sharp":
+ case "sharp", "border-sharp":
opts.border = tui.BorderSharp
- case "noborder":
+ case "noborder", "border-none":
opts.border = tui.BorderNone
+ case "border-horizontal":
+ opts.border = tui.BorderHorizontal
+ case "border-vertical":
+ opts.border = tui.BorderVertical
+ case "border-top":
+ opts.border = tui.BorderTop
+ case "border-bottom":
+ opts.border = tui.BorderBottom
+ case "border-left":
+ opts.border = tui.BorderLeft
+ case "border-right":
+ opts.border = tui.BorderRight
case "follow":
opts.follow = true
case "nofollow":