mroot/lazydocker
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazydocker.git synced 2026-07-25 00:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

scrolling does not go beyond the displayed text #31

Browse source
This commit is contained in:
winhung 2019-07-16 22:37:44 +08:00
parent f384e57917
commit 4de994e030
1 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkg/gui/main_panel.go
View file

@ -22,9 +22,21 @@ func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
_, sy := mainView.Size() _, sy := mainView.Size()
y += sy y += sy
} }
_, sizeY := mainView.Size()
scrollCount := gui.Config.UserConfig.Gui.ScrollHeight
totalLines := mainView.LinesHeight()
if oy+sizeY >= totalLines {
if newOy := totalLines - sizeY; newOy > 0 {
oy = newOy
} else {
scrollCount = 0
}
}
// for some reason we can't work out whether we've hit the bottomq // for some reason we can't work out whether we've hit the bottomq
// there is a large discrepancy in the origin's y value and the length of BufferLines // there is a large discrepancy in the origin's y value and the length of BufferLines
return mainView.SetOrigin(ox, oy+gui.Config.UserConfig.Gui.ScrollHeight) return mainView.SetOrigin(ox, oy+scrollCount)
} }
func (gui *Gui) scrollLeftMain(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) scrollLeftMain(g *gocui.Gui, v *gocui.View) error {
@ -39,7 +51,25 @@ func (gui *Gui) scrollRightMain(g *gocui.Gui, v *gocui.View) error {
mainView := gui.getMainView() mainView := gui.getMainView()
ox, oy := mainView.Origin() ox, oy := mainView.Origin()
return mainView.SetOrigin(ox+gui.Config.UserConfig.Gui.ScrollHeight, oy) content := mainView.ViewBufferLines()
var largestNumberOfCharacters int
for _, txt := range content {
if len(txt) > largestNumberOfCharacters {
largestNumberOfCharacters = len(txt)
}
}
scrollCount := gui.Config.UserConfig.Gui.ScrollHeight
sizeX, _ := mainView.Size()
if ox+sizeX >= largestNumberOfCharacters {
if largestNumberOfCharacters > sizeX {
ox = largestNumberOfCharacters - sizeX
} else {
scrollCount = 0
}
}
return mainView.SetOrigin(ox+scrollCount, oy)
} }
func (gui *Gui) autoScrollMain(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) autoScrollMain(g *gocui.Gui, v *gocui.View) error {