diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2022-01-30 13:08:09 +1100 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2022-03-17 19:13:40 +1100 |
| commit | 8ea7b7a62e5a09314bbe7a446a45e649d66b524d (patch) | |
| tree | 4f2e2fe927b5f8380249e51eef30820383d145e2 /pkg/gui/gui.go | |
| parent | 09dc160da98a0a4fe976d3d174cc93af57c53892 (diff) | |
migrate files context to new structure
Diffstat (limited to 'pkg/gui/gui.go')
| -rw-r--r-- | pkg/gui/gui.go | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 09d508e44..a71b45116 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -175,8 +175,8 @@ type PrevLayout struct { type GuiRepoState struct { // the file panels (files and commit files) can render as a tree, so we have // managers for them which handle rendering a flat list of files in tree form - FileTreeViewModel *filetree.FileTreeViewModel CommitFileTreeViewModel *filetree.CommitFileTreeViewModel + Files []*models.File Submodules []*models.SubmoduleConfig Branches []*models.Branch Commits []*models.Commit @@ -433,14 +433,13 @@ func (gui *Gui) resetState(filterPath string, reuseState bool) { contexts := gui.contextTree() screenMode := SCREEN_NORMAL - initialContext := contexts.Files + var initialContext types.IListContext = contexts.Files if filterPath != "" { screenMode = SCREEN_HALF initialContext = contexts.BranchCommits } gui.State = &GuiRepoState{ - FileTreeViewModel: filetree.NewFileTreeViewModel(make([]*models.File, 0), gui.Log, showTree), CommitFileTreeViewModel: filetree.NewCommitFileTreeViewModel(make([]*models.CommitFile, 0), gui.Log, showTree), Commits: make([]*models.Commit, 0), FilteredReflogCommits: make([]*models.Commit, 0), @@ -586,7 +585,7 @@ func (gui *Gui) setControllers() { bisect: controllers.NewBisectHelper(controllerCommon, gui.git), suggestions: NewSuggestionsHelper(controllerCommon, getState, gui.refreshSuggestions), files: NewFilesHelper(controllerCommon, gui.git, osCommand), - workingTree: NewWorkingTreeHelper(func() *filetree.FileTreeViewModel { return gui.State.FileTreeViewModel }), + workingTree: NewWorkingTreeHelper(func() []*models.File { return gui.State.Files }), tags: controllers.NewTagsHelper(controllerCommon, gui.git), } @@ -609,12 +608,12 @@ func (gui *Gui) setControllers() { ), Files: controllers.NewFilesController( controllerCommon, - func() types.IListContext { return gui.State.Contexts.Files }, + func() *context.WorkingTreeContext { return gui.State.Contexts.Files }, + func() []*models.File { return gui.State.Files }, gui.git, osCommand, gui.getSelectedFileNode, getContexts, - func() *filetree.FileTreeViewModel { return gui.State.FileTreeViewModel }, gui.enterSubmodule, func() []*models.SubmoduleConfig { return gui.State.Submodules }, gui.getSetTextareaTextFn(func() *gocui.View { return gui.Views.CommitMessage }), |