diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-19 18:29:56 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2020-05-19 18:44:53 +1000 |
| commit | cf5cefb2d6bcfd0d403faca5875124eb9b0d7480 (patch) | |
| tree | db67505182488590e152afee0d0f89d983ddaf57 /pkg/gui/global_handlers.go | |
| parent | 36ac764133d3837a22619db922bd8d54f4b0938e (diff) | |
allow user to scroll themselves inside merge panelv0.20.4
Diffstat (limited to 'pkg/gui/global_handlers.go')
| -rw-r--r-- | pkg/gui/global_handlers.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/pkg/gui/global_handlers.go b/pkg/gui/global_handlers.go index 5df00d56f..d1947eff1 100644 --- a/pkg/gui/global_handlers.go +++ b/pkg/gui/global_handlers.go @@ -65,10 +65,18 @@ func (gui *Gui) scrollDownView(viewName string) error { } func (gui *Gui) scrollUpMain(g *gocui.Gui, v *gocui.View) error { + if gui.canScrollMergePanel() { + gui.State.Panels.Merging.UserScrolling = true + } + return gui.scrollUpView("main") } func (gui *Gui) scrollDownMain(g *gocui.Gui, v *gocui.View) error { + if gui.canScrollMergePanel() { + gui.State.Panels.Merging.UserScrolling = true + } + return gui.scrollDownView("main") } |