deblan-mirror/gum
deblan-mirror/gum
1
0
Fork 0
mirror of https://github.com/charmbracelet/gum synced 2024-06-09 01:02:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated how view port line is set

Browse source
This commit is contained in:
Mikael Fangel 2023-04-06 21:28:27 +02:00 committed by Maas Lalani
parent d0c0c0a931
commit be3e250892
No known key found for this signature in database
GPG key ID: 5A6ED5CBF1A0A000
1 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
pager/search.go
View file

@ -83,18 +83,15 @@ func (s *search) NextMatch(m *model) {
m.content = lhs + strings.Replace(rhs, m.content[match[0]:match[1]], s.matchLipglossStr, 1)
// Update the viewport position.
line := 0
for i, c := range softWrapEm(m.content, m.maxWidth, m.softWrap) {
if c == '\n' {
line++
}
if i == match[0]+len(s.matchLipglossStr) {
break
}
var line int
formatStr := softWrapEm(m.content, m.maxWidth, m.softWrap)
index := strings.Index(formatStr, s.matchLipglossStr)
if index != -1 {
line = strings.Count(formatStr[:index], "\n")
}
// Only update if the match is not within the viewport.
if line > m.viewport.YOffset-1+m.viewport.VisibleLineCount()-1 || line < m.viewport.YOffset {
if index != -1 && (line > m.viewport.YOffset-1+m.viewport.VisibleLineCount()-1 || line < m.viewport.YOffset) {
m.viewport.SetYOffset(line)
}
}
@ -128,18 +125,15 @@ func (s *search) PrevMatch(m *model) {
m.content = lhs + strings.Replace(rhs, m.content[match[0]:match[1]], s.matchLipglossStr, 1)
// Update the viewport position.
line := 0
for i, c := range softWrapEm(m.content, m.maxWidth, m.softWrap) {
if c == '\n' {
line++
}
if i == match[0]+len(s.matchLipglossStr) {
break
}
var line int
formatStr := softWrapEm(m.content, m.maxWidth, m.softWrap)
index := strings.Index(formatStr, s.matchLipglossStr)
if index != -1 {
line = strings.Count(formatStr[:index], "\n")
}
// Only update if the match is not within the viewport.
if line > m.viewport.YOffset-1+m.viewport.VisibleLineCount()-1 || line < m.viewport.YOffset {
if index != -1 && (line > m.viewport.YOffset-1+m.viewport.VisibleLineCount()-1 || line < m.viewport.YOffset) {
m.viewport.SetYOffset(line)
}
}