go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-29 22:48:24 +02:00
Code Issues Releases Activity

support scrolling left and right

Browse Source
This commit is contained in:
Jesse Duffield
2021-11-02 20:35:53 +11:00
parent f6ec7babf5
commit 37be9dbea1
16 changed files with 140 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/gui/merge_panel.go
View File

@@ -203,7 +203,7 @@ func (gui *Gui) catSelectedFile() (string, error) {
}
func (gui *Gui) scrollToConflict() error {
if gui.State.Panels.Merging.UserScrolling {
if gui.State.Panels.Merging.UserVerticalScrolling {
return nil
}
@@ -315,5 +315,5 @@ func (gui *Gui) withMergeConflictLock(f func() error) error {
}
func (gui *Gui) takeOverMergeConflictScrolling() {
gui.State.Panels.Merging.UserScrolling = false
gui.State.Panels.Merging.UserVerticalScrolling = false
}