diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go index 5dbf4770a3d..61dfa1d8580 100644 --- a/pkg/gui/controllers/commits_files_controller.go +++ b/pkg/gui/controllers/commits_files_controller.go @@ -424,7 +424,7 @@ func (self *CommitFilesController) collapseAll() error { } func (self *CommitFilesController) expandAll() error { - self.context().CommitFileTreeViewModel.UncollapseAll() + self.context().CommitFileTreeViewModel.ExpandAll() self.c.PostRefreshUpdate(self.context()) diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index dc160809763..ac72565ad8f 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -501,7 +501,7 @@ func (self *FilesController) collapseAll() error { } func (self *FilesController) expandAll() error { - self.context().FileTreeViewModel.UncollapseAll() + self.context().FileTreeViewModel.ExpandAll() self.c.PostRefreshUpdate(self.context()) diff --git a/pkg/gui/filetree/commit_file_tree.go b/pkg/gui/filetree/commit_file_tree.go index 97e1c1b6267..9c8e0bf5239 100644 --- a/pkg/gui/filetree/commit_file_tree.go +++ b/pkg/gui/filetree/commit_file_tree.go @@ -35,7 +35,7 @@ func (self *CommitFileTree) CollapseAll() { } } -func (self *CommitFileTree) UncollapseAll() { +func (self *CommitFileTree) ExpandAll() { self.collapsedPaths.ExpandAll() } diff --git a/pkg/gui/filetree/commit_file_tree_view_model.go b/pkg/gui/filetree/commit_file_tree_view_model.go index 4542ec35c7f..81f1427b888 100644 --- a/pkg/gui/filetree/commit_file_tree_view_model.go +++ b/pkg/gui/filetree/commit_file_tree_view_model.go @@ -177,10 +177,10 @@ func (self *CommitFileTreeViewModel) CollapseAll() { } } -func (self *CommitFileTreeViewModel) UncollapseAll() { +func (self *CommitFileTreeViewModel) ExpandAll() { selectedNode := self.GetSelected() - self.ICommitFileTree.UncollapseAll() + self.ICommitFileTree.ExpandAll() if selectedNode == nil { return diff --git a/pkg/gui/filetree/file_tree.go b/pkg/gui/filetree/file_tree.go index 047b181b441..c7cf1c76c1e 100644 --- a/pkg/gui/filetree/file_tree.go +++ b/pkg/gui/filetree/file_tree.go @@ -32,7 +32,7 @@ type ITree[T any] interface { ToggleCollapsed(path string) CollapsedPaths() *CollapsedPaths CollapseAll() - UncollapseAll() + ExpandAll() } type IFileTree interface { @@ -183,7 +183,7 @@ func (self *FileTree) CollapseAll() { } } -func (self *FileTree) UncollapseAll() { +func (self *FileTree) ExpandAll() { self.collapsedPaths.ExpandAll() } diff --git a/pkg/gui/filetree/file_tree_view_model.go b/pkg/gui/filetree/file_tree_view_model.go index 34425985891..29f5638348b 100644 --- a/pkg/gui/filetree/file_tree_view_model.go +++ b/pkg/gui/filetree/file_tree_view_model.go @@ -207,10 +207,10 @@ func (self *FileTreeViewModel) CollapseAll() { } } -func (self *FileTreeViewModel) UncollapseAll() { +func (self *FileTreeViewModel) ExpandAll() { selectedNode := self.GetSelected() - self.IFileTree.UncollapseAll() + self.IFileTree.ExpandAll() if selectedNode == nil { return