1
0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-11-25 22:32:13 +02:00

support scrolling left and right

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

View File

@@ -145,9 +145,9 @@ type LblPanelState struct {
type MergingPanelState struct {
*mergeconflicts.State
// UserScrolling tells us if the user has started scrolling through the file themselves
// UserVerticalScrolling tells us if the user has started scrolling through the file themselves
// in which case we won't auto-scroll to a conflict.
UserScrolling bool
UserVerticalScrolling bool
}
type filePanelState struct {
@@ -403,8 +403,8 @@ func (gui *Gui) resetState(filterPath string, reuseState bool) {
Menu: &menuPanelState{listPanelState: listPanelState{SelectedLineIdx: 0}, OnPress: nil},
Suggestions: &suggestionsPanelState{listPanelState: listPanelState{SelectedLineIdx: 0}},
Merging: &MergingPanelState{
State: mergeconflicts.NewState(),
UserScrolling: false,
State: mergeconflicts.NewState(),
UserVerticalScrolling: false,
},
},
Ptmx: nil,