summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJunegunn Choi <junegunn.c@gmail.com>2023-01-30 21:39:18 +0900
committerJunegunn Choi <junegunn.c@gmail.com>2023-01-30 21:39:18 +0900
commitfccab60a5cd0b6e74cb8fd5a7d87f4baaeba2f95 (patch)
treeba2e6e02b234ec7c97a297611c8a4cd2e9abbb5c /src
parent0f4af384571aaf6bcf9146c345feb5c6916c6790 (diff)
downloadfzf-fccab60a5cd0b6e74cb8fd5a7d87f4baaeba2f95.tar.gz
`--preview-window 0,hidden` should not execute the preview command
Until `toggle-preview` action is triggered Fix #3149
Diffstat (limited to 'src')
-rw-r--r--src/terminal.go10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/terminal.go b/src/terminal.go
index 03cbdd68..8c6259a4 100644
--- a/src/terminal.go
+++ b/src/terminal.go
@@ -1244,6 +1244,8 @@ func (t *Terminal) resizeWindows(forcePreview bool) {
}
}
resizePreviewWindows(&t.previewOpts)
+ } else {
+ t.activePreviewOpts = &t.previewOpts
}
// Without preview window
@@ -2279,7 +2281,7 @@ func (t *Terminal) mayNeedPreviewWindow() bool {
// Check if previewer is currently in action (invisible previewer with size 0 or visible previewer)
func (t *Terminal) isPreviewEnabled() bool {
- return t.hasPreviewer() && t.previewer.enabled && (!t.previewOpts.Visible() || t.pwindow != nil)
+ return t.hasPreviewer() && t.previewer.enabled && (!t.previewOpts.Visible() && !t.previewOpts.hidden || t.pwindow != nil)
}
func (t *Terminal) hasPreviewWindow() bool {
@@ -2866,11 +2868,7 @@ func (t *Terminal) Loop() {
return false
case actTogglePreview:
if t.hasPreviewer() {
- if t.activePreviewOpts != nil {
- t.activePreviewOpts.Toggle()
- } else if !t.previewOpts.Visible() {
- t.previewer.enabled = !t.previewer.enabled
- }
+ t.activePreviewOpts.Toggle()
updatePreviewWindow(false)
if t.isPreviewEnabled() {
valid, list := t.buildPlusList(t.previewOpts.command, false, false)