support user-configurable author colours

blm · Oct 30, 2021 · c47c539 · c47c539
1 parent c96496c
commit c47c539
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 0 deletions.
diff --git a/docs/Config.md b/docs/Config.md
@@ -50,6 +50,8 @@ gui:
   showRandomTip: true
   showCommandLog: true
   commandLogSize: 8
+  authorColors: # in case you're not happy with the randomly assigned colour
+    'John Smith': '#ff0000'
 git:
   paging:
     colorArg: always

diff --git a/pkg/config/user_config.go b/pkg/config/user_config.go
@@ -24,6 +24,7 @@ type RefresherConfig struct {
 }
 
 type GuiConfig struct {
+	AuthorColors             map[string]string  `yaml:"authorColors"`
 	ScrollHeight             int                `yaml:"scrollHeight"`
 	ScrollPastBottom         bool               `yaml:"scrollPastBottom"`
 	MouseEvents              bool               `yaml:"mouseEvents"`

diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go
@@ -22,6 +22,7 @@ import (
 	"github.com/jesseduffield/lazygit/pkg/gui/modes/cherrypicking"
 	"github.com/jesseduffield/lazygit/pkg/gui/modes/diffing"
 	"github.com/jesseduffield/lazygit/pkg/gui/modes/filtering"
+	"github.com/jesseduffield/lazygit/pkg/gui/presentation/authors"
 	"github.com/jesseduffield/lazygit/pkg/gui/style"
 	"github.com/jesseduffield/lazygit/pkg/gui/types"
 	"github.com/jesseduffield/lazygit/pkg/i18n"
@@ -452,6 +453,8 @@ func NewGui(log *logrus.Entry, gitCommand *commands.GitCommand, oSCommand *oscom
 	oSCommand.SetOnRunCommand(onRunCommand)
 	gui.OnRunCommand = onRunCommand
 
+	authors.SetCustomAuthors(gui.Config.GetUserConfig().Gui.AuthorColors)
+
 	return gui, nil
 }
 

diff --git a/pkg/gui/presentation/authors/authors.go b/pkg/gui/presentation/authors/authors.go
@@ -11,6 +11,8 @@ import (
 	"github.com/mattn/go-runewidth"
 )
 
+// if these being global variables causes trouble we can wrap them in a struct
+// attached to the gui state.
 var authorInitialCache = make(map[string]string)
 var authorNameCache = make(map[string]string)
 var authorStyleCache = make(map[string]style.TextStyle)
@@ -101,3 +103,10 @@ func getFirstRune(str string) rune {
 	// should never land here
 	return 0
 }
+
+func SetCustomAuthors(customAuthorColors map[string]string) {
+	for authorName, colorSequence := range customAuthorColors {
+		style := style.New().SetFg(style.NewRGBColor(color.HEX(colorSequence, false)))
+		authorStyleCache[authorName] = style
+	}
+}