sysutils/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-08-06 11:02:41 +03:00
Code Activity

allow secondary view to be scrolled

Browse Source
This commit is contained in:
Jesse Duffield
2019-11-10 16:50:36 +11:00
parent 5c518eda0a
commit 941d3c6648
2 changed files with 32 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/gui/gui.go
View File

@@ -206,15 +206,15 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *comma
return gui, nil return gui, nil
} }
func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) scrollUpView(viewName string) error {
mainView, _ := g.View("main") mainView, _ := gui.g.View(viewName)
ox, oy := mainView.Origin() ox, oy := mainView.Origin()
newOy := int(math.Max(0, float64(oy-gui.Config.GetUserConfig().GetInt("gui.scrollHeight")))) newOy := int(math.Max(0, float64(oy-gui.Config.GetUserConfig().GetInt("gui.scrollHeight"))))
return mainView.SetOrigin(ox, newOy) return mainView.SetOrigin(ox, newOy)
} }
func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) scrollDownView(viewName string) error {
mainView, _ := g.View("main") mainView, _ := gui.g.View(viewName)
ox, oy := mainView.Origin() ox, oy := mainView.Origin()
y := oy y := oy
if !gui.Config.GetUserConfig().GetBool("gui.scrollPastBottom") { if !gui.Config.GetUserConfig().GetBool("gui.scrollPastBottom") {
@@ -227,6 +227,22 @@ func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
return nil return nil
} }
func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error {
return gui.scrollUpView("main")
}
func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error {
return gui.scrollDownView("main")
}
func (gui *Gui) scrollUpSecondary(g *gocui.Gui, v *gocui.View) error {
return gui.scrollUpView("secondary")
}
func (gui *Gui) scrollDownSecondary(g *gocui.Gui, v *gocui.View) error {
return gui.scrollDownView("secondary")
}
func (gui *Gui) handleRefresh(g *gocui.Gui, v *gocui.View) error { func (gui *Gui) handleRefresh(g *gocui.Gui, v *gocui.View) error {
return gui.refreshSidePanels(g) return gui.refreshSidePanels(g)
} }

12
pkg/gui/keybindings.go
View File

@@ -543,6 +543,18 @@ func (gui *Gui) GetInitialKeybindings() []*Binding {
Handler: gui.handleEnterCommitFile, Handler: gui.handleEnterCommitFile,
Description: gui.Tr.SLocalize("enterFile"), Description: gui.Tr.SLocalize("enterFile"),
}, },
{
ViewName: "secondary",
Key: gocui.MouseWheelUp,
Modifier: gocui.ModNone,
Handler: gui.scrollUpSecondary,
},
{
ViewName: "secondary",
Key: gocui.MouseWheelDown,
Modifier: gocui.ModNone,
Handler: gui.scrollDownSecondary,
},
} }
for _, viewName := range []string{"status", "branches", "files", "commits", "commitFiles", "stash", "menu"} { for _, viewName := range []string{"status", "branches", "files", "commits", "commitFiles", "stash", "menu"} {