diff options
author | mjarkk <mkopenga@gmail.com> | 2019-10-19 11:39:18 +0200 |
---|---|---|
committer | Jesse Duffield <jessedduffield@gmail.com> | 2019-10-20 12:32:57 +1100 |
commit | a045313e080d2c083425e89cfd8a004cbcf72ef7 (patch) | |
tree | 72e916f19a2b71e04dfa146823e5f0575cd8e855 /pkg/gui/gui.go | |
parent | 9bd2dc3050b5342ee708a7d189986eaf16b1c9ff (diff) |
Removed the pkg/gui/theme.go file
Moved most functions to the new theme/theme.go
Diffstat (limited to 'pkg/gui/gui.go')
-rw-r--r-- | pkg/gui/gui.go | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/pkg/gui/gui.go b/pkg/gui/gui.go index 6430b19f7..e82beea03 100644 --- a/pkg/gui/gui.go +++ b/pkg/gui/gui.go @@ -444,7 +444,8 @@ func (gui *Gui) layout(g *gocui.Gui) error { return err } v.Frame = false - v.FgColor = gui.GetOptionsPanelTextColor() + userConfig := gui.Config.GetUserConfig() + v.FgColor = theme.GetColor(userConfig.GetStringSlice("gui.theme.optionsTextColor")) } if gui.getCommitMessageView() == nil { @@ -650,7 +651,7 @@ func (gui *Gui) Run() error { gui.g = g // TODO: always use gui.g rather than passing g around everywhere - if err := gui.SetColorScheme(); err != nil { + if err := gui.setColorScheme(); err != nil { return err } @@ -745,3 +746,14 @@ func (gui *Gui) handleDonate(g *gocui.Gui, v *gocui.View) error { } return gui.OSCommand.OpenLink("https://donorbox.org/lazygit") } + +// setColorScheme sets the color scheme for the app based on the user config +func (gui *Gui) setColorScheme() error { + userConfig := gui.Config.GetUserConfig() + theme.UpdateTheme(userConfig) + + gui.g.FgColor = theme.InactiveBorderColor + gui.g.SelFgColor = theme.ActiveBorderColor + + return nil +} |