diff options
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") } |