From fccab60a5cd0b6e74cb8fd5a7d87f4baaeba2f95 Mon Sep 17 00:00:00 2001 From: Junegunn Choi Date: Mon, 30 Jan 2023 21:39:18 +0900 Subject: `--preview-window 0,hidden` should not execute the preview command Until `toggle-preview` action is triggered Fix #3149 --- src/terminal.go | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src') 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) -- cgit v1.2.3