diff options
Diffstat (limited to 'pkg/gui/controllers')
| -rw-r--r-- | pkg/gui/controllers/commits_files_controller.go | 4 | ||||
| -rw-r--r-- | pkg/gui/controllers/files_controller.go | 10 | ||||
| -rw-r--r-- | pkg/gui/controllers/files_remove_controller.go | 2 | ||||
| -rw-r--r-- | pkg/gui/controllers/list_controller.go | 6 | ||||
| -rw-r--r-- | pkg/gui/controllers/local_commits_controller.go | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go index d0015faff..933d17321 100644 --- a/pkg/gui/controllers/commits_files_controller.go +++ b/pkg/gui/controllers/commits_files_controller.go @@ -80,7 +80,7 @@ func (self *CommitFilesController) GetMouseKeybindings(opts types.KeybindingsOpt func (self *CommitFilesController) checkSelected(callback func(*filetree.CommitFileNode) error) func() error { return func() error { - selected := self.context().GetSelectedFileNode() + selected := self.context().GetSelected() if selected == nil { return nil } @@ -98,7 +98,7 @@ func (self *CommitFilesController) context() *context.CommitFilesContext { } func (self *CommitFilesController) onClickMain(opts gocui.ViewMouseBindingOpts) error { - node := self.context().GetSelectedFileNode() + node := self.context().GetSelected() if node == nil { return nil } diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index 5fcde5202..db3eca7b1 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -216,7 +216,7 @@ func (self *FilesController) press(node *filetree.FileNode) error { func (self *FilesController) checkSelectedFileNode(callback func(*filetree.FileNode) error) func() error { return func() error { - node := self.context().GetSelectedFileNode() + node := self.context().GetSelected() if node == nil { return nil } @@ -234,7 +234,7 @@ func (self *FilesController) context() *context.WorkingTreeContext { } func (self *FilesController) getSelectedFile() *models.File { - node := self.context().GetSelectedFileNode() + node := self.context().GetSelected() if node == nil { return nil } @@ -246,7 +246,7 @@ func (self *FilesController) enter() error { } func (self *FilesController) EnterFile(opts types.OnFocusOpts) error { - node := self.context().GetSelectedFileNode() + node := self.context().GetSelected() if node == nil { return nil } @@ -535,7 +535,7 @@ func (self *FilesController) edit(node *filetree.FileNode) error { } func (self *FilesController) Open() error { - node := self.context().GetSelectedFileNode() + node := self.context().GetSelected() if node == nil { return nil } @@ -583,7 +583,7 @@ func (self *FilesController) createResetToUpstreamMenu() error { } func (self *FilesController) handleToggleDirCollapsed() error { - node := self.context().GetSelectedFileNode() + node := self.context().GetSelected() if node == nil { return nil } diff --git a/pkg/gui/controllers/files_remove_controller.go b/pkg/gui/controllers/files_remove_controller.go index 521167c33..c2416bfaf 100644 --- a/pkg/gui/controllers/files_remove_controller.go +++ b/pkg/gui/controllers/files_remove_controller.go @@ -139,7 +139,7 @@ func (self *FilesRemoveController) ResetSubmodule(submodule *models.SubmoduleCon func (self *FilesRemoveController) checkSelectedFileNode(callback func(*filetree.FileNode) error) func() error { return func() error { - node := self.context().GetSelectedFileNode() + node := self.context().GetSelected() if node == nil { return nil } diff --git a/pkg/gui/controllers/list_controller.go b/pkg/gui/controllers/list_controller.go index c9898f908..0f64228bb 100644 --- a/pkg/gui/controllers/list_controller.go +++ b/pkg/gui/controllers/list_controller.go @@ -83,11 +83,11 @@ func (self *ListController) HandleNextPage() error { } func (self *ListController) HandleGotoTop() error { - return self.handleLineChange(-self.context.GetList().GetItemsLength()) + return self.handleLineChange(-self.context.GetList().Len()) } func (self *ListController) HandleGotoBottom() error { - return self.handleLineChange(self.context.GetList().GetItemsLength()) + return self.handleLineChange(self.context.GetList().Len()) } func (self *ListController) HandleClick(opts gocui.ViewMouseBindingOpts) error { @@ -99,7 +99,7 @@ func (self *ListController) HandleClick(opts gocui.ViewMouseBindingOpts) error { return err } - if newSelectedLineIdx > self.context.GetList().GetItemsLength()-1 { + if newSelectedLineIdx > self.context.GetList().Len()-1 { return nil } diff --git a/pkg/gui/controllers/local_commits_controller.go b/pkg/gui/controllers/local_commits_controller.go index b54cfa3c0..d45e3ed56 100644 --- a/pkg/gui/controllers/local_commits_controller.go +++ b/pkg/gui/controllers/local_commits_controller.go @@ -588,7 +588,7 @@ func (self *LocalCommitsController) gotoBottom() error { } } - self.context().SetSelectedLineIdx(self.context().GetItemsLength() - 1) + self.context().SetSelectedLineIdx(self.context().Len() - 1) return nil } |