twin/fzf
1
0
Fork 0
mirror of https://github.com/junegunn/fzf.git synced 2025-08-19 14:33:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Disable preview scroll if the content fits on the screen

Browse Source 
Close #1540
This commit is contained in:
Junegunn Choi
2019-03-29 18:28:45 +09:00
parent 89e24bf8f2
commit 37585bd5a5
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/terminal.go
View File

@@ -40,6 +40,7 @@ type previewer struct {
lines int lines int
offset int offset int
enabled bool enabled bool
more bool
} }
type itemLine struct { type itemLine struct {
@@ -410,7 +411,7 @@ func NewTerminal(opts *Options, eventBox *util.EventBox) *Terminal {
selected: make(map[int32]selectedItem), selected: make(map[int32]selectedItem),
reqBox: util.NewEventBox(), reqBox: util.NewEventBox(),
preview: opts.Preview, preview: opts.Preview,
previewer: previewer{"", 0, 0, previewBox != nil && !opts.Preview.hidden}, previewer: previewer{"", 0, 0, previewBox != nil && !opts.Preview.hidden, false},
previewBox: previewBox, previewBox: previewBox,
eventBox: eventBox, eventBox: eventBox,
mutex: sync.Mutex{}, mutex: sync.Mutex{},
@@ -1027,18 +1028,17 @@ func (t *Terminal) printPreview() {
reader := bufio.NewReader(strings.NewReader(t.previewer.text)) reader := bufio.NewReader(strings.NewReader(t.previewer.text))
lineNo := -t.previewer.offset lineNo := -t.previewer.offset
height := t.pwindow.Height() height := t.pwindow.Height()
t.previewer.more = t.previewer.offset > 0
var ansi *ansiState var ansi *ansiState
for { for ; ; lineNo++ {
line, err := reader.ReadString('\n') line, err := reader.ReadString('\n')
eof := err == io.EOF eof := err == io.EOF
if !eof { if !eof {
line = line[:len(line)-1] line = line[:len(line)-1]
} }
lineNo++ if lineNo >= height || t.pwindow.Y() == height-1 && t.pwindow.X() > 0 {
if lineNo > height ||
t.pwindow.Y() == height-1 && t.pwindow.X() > 0 {
break break
} else if lineNo > 0 { } else if lineNo >= 0 {
var fillRet tui.FillReturn var fillRet tui.FillReturn
prefixWidth := 0 prefixWidth := 0
_, _, ansi = extractColor(line, ansi, func(str string, ansi *ansiState) bool { _, _, ansi = extractColor(line, ansi, func(str string, ansi *ansiState) bool {
@@ -1055,6 +1055,7 @@ func (t *Terminal) printPreview() {
} }
return fillRet == tui.FillContinue return fillRet == tui.FillContinue
}) })
t.previewer.more = t.previewer.more || t.pwindow.Y() == height-1 && t.pwindow.X() > 0
if fillRet == tui.FillNextLine { if fillRet == tui.FillNextLine {
continue continue
} else if fillRet == tui.FillSuspend { } else if fillRet == tui.FillSuspend {
@@ -1068,6 +1069,7 @@ func (t *Terminal) printPreview() {
} }
t.pwindow.FinishFill() t.pwindow.FinishFill()
if t.previewer.lines > height { if t.previewer.lines > height {
t.previewer.more = true
offset := fmt.Sprintf("%d/%d", t.previewer.offset+1, t.previewer.lines) offset := fmt.Sprintf("%d/%d", t.previewer.offset+1, t.previewer.lines)
pos := t.pwindow.Width() - len(offset) pos := t.pwindow.Width() - len(offset)
if t.tui.DoesAutoWrap() { if t.tui.DoesAutoWrap() {
@@ -1651,6 +1653,9 @@ func (t *Terminal) Loop() {
} }
} }
scrollPreview := func(amount int) { scrollPreview := func(amount int) {
if !t.previewer.more {
return
}
newOffset := util.Constrain( newOffset := util.Constrain(
t.previewer.offset+amount, 0, t.previewer.lines-1) t.previewer.offset+amount, 0, t.previewer.lines-1)
if t.previewer.offset != newOffset { if t.previewer.offset != newOffset {