diff --git a/pkg/gui/controllers/commits_files_controller.go b/pkg/gui/controllers/commits_files_controller.go index 34bc350ed..ecce1834e 100644 --- a/pkg/gui/controllers/commits_files_controller.go +++ b/pkg/gui/controllers/commits_files_controller.go @@ -231,7 +231,7 @@ func (self *CommitFilesController) openCopyMenu() error { copyPathItem := &types.MenuItem{ Label: self.c.Tr.CopyFilePath, OnPress: func() error { - if err := self.c.OS().CopyToClipboard(node.Path); err != nil { + if err := self.c.OS().CopyToClipboard(node.GetPath()); err != nil { return err } self.c.Toast(self.c.Tr.FilePathCopiedToast) diff --git a/pkg/gui/controllers/files_controller.go b/pkg/gui/controllers/files_controller.go index e0ee96f81..d53eec24b 100644 --- a/pkg/gui/controllers/files_controller.go +++ b/pkg/gui/controllers/files_controller.go @@ -410,7 +410,7 @@ func (self *FilesController) pressWithLock(selectedNodes []*filetree.FileNode) e toPaths := func(nodes []*filetree.FileNode) []string { return lo.Map(nodes, func(node *filetree.FileNode, _ int) string { - return node.Path + return node.GetPath() }) } @@ -881,7 +881,7 @@ func (self *FilesController) openDiffTool(node *filetree.FileNode) error { return self.c.RunSubprocessAndRefresh( self.c.Git().Diff.OpenDiffToolCmdObj( git_commands.DiffToolCmdOptions{ - Filepath: node.Path, + Filepath: node.GetPath(), FromCommit: fromCommit, ToCommit: "", Reverse: reverse, @@ -979,7 +979,7 @@ func (self *FilesController) openCopyMenu() error { copyPathItem := &types.MenuItem{ Label: self.c.Tr.CopyFilePath, OnPress: func() error { - if err := self.c.OS().CopyToClipboard(node.Path); err != nil { + if err := self.c.OS().CopyToClipboard(node.GetPath()); err != nil { return err } self.c.Toast(self.c.Tr.FilePathCopiedToast) diff --git a/pkg/gui/presentation/files.go b/pkg/gui/presentation/files.go index 0641c4cbf..449dfccec 100644 --- a/pkg/gui/presentation/files.go +++ b/pkg/gui/presentation/files.go @@ -293,7 +293,7 @@ func getColorForChangeStatus(changeStatus string) style.TextStyle { } func fileNameAtDepth(node *filetree.Node[models.File], depth int) string { - splitName := split(node.Path) + splitName := split(node.GetPath()) name := join(splitName[depth:]) if node.File != nil && node.File.IsRename() { @@ -314,7 +314,7 @@ func fileNameAtDepth(node *filetree.Node[models.File], depth int) string { } func commitFileNameAtDepth(node *filetree.Node[models.CommitFile], depth int) string { - splitName := split(node.Path) + splitName := split(node.GetPath()) name := join(splitName[depth:]) return name