go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-04-25 12:24:47 +02:00
Code Issues Releases Activity

Merge pull request #2219 from Ryooooooga/stash-icon

Browse Source
This commit is contained in:
Jesse Duffield 2022-10-14 08:41:39 -07:00 committed by GitHub
commit 05089b9a9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/gui/presentation/icons/git_icons.go
View File

@ -13,6 +13,7 @@ const (
COMMIT_ICON = "\ufc16" // ﰖ COMMIT_ICON = "\ufc16" // ﰖ
MERGE_COMMIT_ICON = "\ufb2c" // שּׁ MERGE_COMMIT_ICON = "\ufb2c" // שּׁ
DEFAULT_REMOTE_ICON = "\uf7a1" //  DEFAULT_REMOTE_ICON = "\uf7a1" // 
STASH_ICON = "\uf01c" // 
) )
type remoteIcon struct { type remoteIcon struct {
@ -59,3 +60,7 @@ func IconForRemote(remote *models.Remote) string {
} }
return DEFAULT_REMOTE_ICON return DEFAULT_REMOTE_ICON
} }
func IconForStash(stash *models.StashEntry) string {
return STASH_ICON
}

9
pkg/gui/presentation/stash_entries.go
View File

@ -3,6 +3,7 @@ package presentation
import ( import (
"github.com/jesseduffield/generics/slices" "github.com/jesseduffield/generics/slices"
"github.com/jesseduffield/lazygit/pkg/commands/models" "github.com/jesseduffield/lazygit/pkg/commands/models"
"github.com/jesseduffield/lazygit/pkg/gui/presentation/icons"
"github.com/jesseduffield/lazygit/pkg/theme" "github.com/jesseduffield/lazygit/pkg/theme"
) )
@ -19,5 +20,11 @@ func getStashEntryDisplayStrings(s *models.StashEntry, diffed bool) []string {
if diffed { if diffed {
textStyle = theme.DiffTerminalColor textStyle = theme.DiffTerminalColor
} }
return []string{textStyle.Sprint(s.Name)}
res := make([]string, 0, 2)
if icons.IsIconEnabled() {
res = append(res, textStyle.Sprint(icons.IconForStash(s)))
}
res = append(res, textStyle.Sprint(s.Name))
return res
} }