summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Duffield <jessedduffield@gmail.com>2021-11-10 08:48:58 +1100
committerJesse Duffield <jessedduffield@gmail.com>2021-11-10 08:54:14 +1100
commit2f45db8f7c570383647b06db2fa7449b753ae217 (patch)
tree2e89e5740c7893c154597c34d6a4f04bd647e032
parent3fb478a30e5c88af10c6e1e90eb22c99113f2967 (diff)
fix scrolling in sub commits panelv0.31.3
-rw-r--r--pkg/gui/list_context_config.go82
1 files changed, 41 insertions, 41 deletions
diff --git a/pkg/gui/list_context_config.go b/pkg/gui/list_context_config.go
index 814e4677d..48b08f492 100644
--- a/pkg/gui/list_context_config.go
+++ b/pkg/gui/list_context_config.go
@@ -186,6 +186,47 @@ func (gui *Gui) branchCommitsListContext() IListContext {
}
}
+func (gui *Gui) subCommitsListContext() IListContext {
+ parseEmoji := gui.Config.GetUserConfig().Git.ParseEmoji
+ return &ListContext{
+ BasicContext: &BasicContext{
+ ViewName: "branches",
+ WindowName: "branches",
+ Key: SUB_COMMITS_CONTEXT_KEY,
+ Kind: SIDE_CONTEXT,
+ },
+ GetItemsLength: func() int { return len(gui.State.SubCommits) },
+ OnGetPanelState: func() IListPanelState { return gui.State.Panels.SubCommits },
+ OnFocus: gui.handleSubCommitSelect,
+ Gui: gui,
+ GetDisplayStrings: func(startIdx int, length int) [][]string {
+ selectedCommitSha := ""
+ if gui.currentContext().GetKey() == SUB_COMMITS_CONTEXT_KEY {
+ selectedCommit := gui.getSelectedSubCommit()
+ if selectedCommit != nil {
+ selectedCommitSha = selectedCommit.Sha
+ }
+ }
+ return presentation.GetCommitListDisplayStrings(
+ gui.State.SubCommits,
+ gui.State.ScreenMode != SCREEN_NORMAL,
+ gui.cherryPickedCommitShaMap(),
+ gui.State.Modes.Diffing.Ref,
+ parseEmoji,
+ selectedCommitSha,
+ startIdx,
+ length,
+ gui.shouldShowGraph(),
+ )
+ },
+ SelectedItem: func() (ListItem, bool) {
+ item := gui.getSelectedSubCommit()
+ return item, item != nil
+ },
+ RenderSelection: true,
+ }
+}
+
func (gui *Gui) shouldShowGraph() bool {
value := gui.Config.GetUserConfig().Git.Log.ShowGraph
switch value {
@@ -230,47 +271,6 @@ func (gui *Gui) reflogCommitsListContext() IListContext {
}
}
-func (gui *Gui) subCommitsListContext() IListContext {
- parseEmoji := gui.Config.GetUserConfig().Git.ParseEmoji
- return &ListContext{
- BasicContext: &BasicContext{
- ViewName: "branches",
- WindowName: "branches",
- Key: SUB_COMMITS_CONTEXT_KEY,
- Kind: SIDE_CONTEXT,
- },
- GetItemsLength: func() int { return len(gui.State.SubCommits) },
- OnGetPanelState: func() IListPanelState { return gui.State.Panels.SubCommits },
- OnFocus: gui.handleSubCommitSelect,
- Gui: gui,
- GetDisplayStrings: func(startIdx int, length int) [][]string {
- selectedCommitSha := ""
- if gui.currentContext().GetKey() == SUB_COMMITS_CONTEXT_KEY {
- selectedCommit := gui.getSelectedSubCommit()
- if selectedCommit != nil {
- selectedCommitSha = selectedCommit.Sha
- }
- }
- return presentation.GetCommitListDisplayStrings(
- gui.State.SubCommits,
- gui.State.ScreenMode != SCREEN_NORMAL,
- gui.cherryPickedCommitShaMap(),
- gui.State.Modes.Diffing.Ref,
- parseEmoji,
- selectedCommitSha,
- 0,
- len(gui.State.SubCommits),
- gui.shouldShowGraph(),
- )
- },
- SelectedItem: func() (ListItem, bool) {
- item := gui.getSelectedSubCommit()
- return item, item != nil
- },
- RenderSelection: true,
- }
-}
-
func (gui *Gui) stashListContext() IListContext {
return &ListContext{
BasicContext: &BasicContext{