go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-05-23 22:50:41 +02:00
Code Issues Releases Activity

Merge branch 'master' into feature/translations

Browse Source
This commit is contained in:
Jesse Duffield 2018-11-14 19:35:51 +11:00 committed by GitHub
commit b8d5adcb84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/Config.md
View File

@ -6,6 +6,7 @@
gui: gui:
# stuff relating to the UI # stuff relating to the UI
scrollHeight: 2 # how many lines you scroll by scrollHeight: 2 # how many lines you scroll by
scrollPastBottom: true # enable scrolling past the bottom
theme: theme:
activeBorderColor: activeBorderColor:
- white - white

1
pkg/config/app_config.go
View File

@ -214,6 +214,7 @@ func GetDefaultConfig() []byte {
`gui: `gui:
## stuff relating to the UI ## stuff relating to the UI
scrollHeight: 2 scrollHeight: 2
scrollPastBottom: true
theme: theme:
activeBorderColor: activeBorderColor:
- white - white

7
pkg/gui/gui.go
View File

@ -130,7 +130,12 @@ func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error {
func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
mainView, _ := g.View("main") mainView, _ := g.View("main")
ox, oy := mainView.Origin() ox, oy := mainView.Origin()
if oy < len(mainView.BufferLines()) { y := oy
if !gui.Config.GetUserConfig().GetBool("gui.scrollPastBottom") {
_, sy := mainView.Size()
y += sy
}
if y < len(mainView.BufferLines()) {
return mainView.SetOrigin(ox, oy+gui.Config.GetUserConfig().GetInt("gui.scrollHeight")) return mainView.SetOrigin(ox, oy+gui.Config.GetUserConfig().GetInt("gui.scrollHeight"))
} }
return nil return nil