Add three theme options

- Make title color options separate from border color options
- Add option to change title color of selected tabs in inactive views

docs/Config.md

@@ -53,6 +53,13 @@ gui:
  searchingActiveBorderColor:
  - cyan
  - bold
+ activeTitleColor:
+ - green
+ - bold
+ inactiveTitleColor:
+ - default
+ inactiveSelTabTitleColor: # style of 'current tab' title in inactive views
+ - default # 'default' is activeTitleColor without bold
  optionsTextColor:
  - blue
  selectedLineBgColor:

pkg/config/user_config.go

@@ -161,6 +161,12 @@ type ThemeConfig struct {
  ActiveBorderColor []string `yaml:"activeBorderColor" jsonschema:"minItems=1,uniqueItems=true"`
  // Border color of non-focused windows
  InactiveBorderColor []string `yaml:"inactiveBorderColor" jsonschema:"minItems=1,uniqueItems=true"`
+ // Title color of focused window
+ ActiveTitleColor []string `yaml:"activeTitleColor" jsonschema:"minItems=1,uniqueItems=true"`
+ // Title color of non-focused window
+ InactiveTitleColor []string `yaml:"inactiveTitleColor" jsonschema:"minItems=1,uniqueItems=true"`
+ // Title color of selected tab in non-focused window
+ InactiveSelTabTitleColor []string `yaml:"inactiveSelTabTitleColor" jsonschema:"minItems=1,uniqueItems=true"`
  // Border color of focused window when searching in that window
  SearchingActiveBorderColor []string `yaml:"searchingActiveBorderColor" jsonschema:"minItems=1,uniqueItems=true"`
  // Color of keybindings help text in the bottom line
@@ -655,6 +661,9 @@ func GetDefaultConfig() *UserConfig {
  ActiveBorderColor: []string{"green", "bold"},
  SearchingActiveBorderColor: []string{"cyan", "bold"},
  InactiveBorderColor: []string{"default"},
+ ActiveTitleColor: []string{"green", "bold"},
+ InactiveTitleColor: []string{"default"},
+ InactiveSelTabTitleColor: []string{"default"},
  OptionsTextColor: []string{"blue"},
  SelectedLineBgColor: []string{"blue"},
  CherryPickedCommitBgColor: []string{"cyan"},

pkg/gui/controllers/helpers/search_helper.go

@@ -295,6 +295,6 @@ func (self *SearchHelper) setSearchingFrameColor() {
 }
 
 func (self *SearchHelper) setNonSearchingFrameColor() {
- self.c.GocuiGui().SelFgColor = theme.ActiveBorderColor
+ self.c.GocuiGui().SelFgColor = theme.ActiveTitleColor
  self.c.GocuiGui().SelFrameColor = theme.ActiveBorderColor
 }

pkg/gui/gui.go

@@ -944,8 +944,9 @@ func (gui *Gui) setColorScheme() error {
  userConfig := gui.UserConfig
  theme.UpdateTheme(userConfig.Gui.Theme)
 
- gui.g.FgColor = theme.InactiveBorderColor
- gui.g.SelFgColor = theme.ActiveBorderColor
+ gui.g.FgColor = theme.InactiveTitleColor
+ gui.g.SelFgColor = theme.ActiveTitleColor
+ gui.g.InactiveSelFgColor = theme.InactiveSelTabTitleColor
  gui.g.FrameColor = theme.InactiveBorderColor
  gui.g.SelFrameColor = theme.ActiveBorderColor
 

pkg/theme/theme.go

@@ -19,6 +19,15 @@ var (
  // InactiveBorderColor is the border color of the inactive active frames
  InactiveBorderColor gocui.Attribute
 
+ // ActiveTitleColor is the foreground color of the active view title
+ ActiveTitleColor gocui.Attribute
+
+ // InactiveTitleColor is the foreground color of the inactive view titles
+ InactiveTitleColor gocui.Attribute
+
+ // InactiveSelTabTitleColor is the foreground color of title of 'current' tab in inactive views
+ InactiveSelTabTitleColor gocui.Attribute
+
  // FilteredActiveBorderColor is the border color of the active frame, when it's being searched/filtered
  SearchingActiveBorderColor gocui.Attribute
 
@@ -47,6 +56,9 @@ var (
 func UpdateTheme(themeConfig config.ThemeConfig) {
  ActiveBorderColor = GetGocuiStyle(themeConfig.ActiveBorderColor)
  InactiveBorderColor = GetGocuiStyle(themeConfig.InactiveBorderColor)
+ ActiveTitleColor = GetGocuiStyle(themeConfig.ActiveTitleColor)
+ InactiveTitleColor = GetGocuiStyle(themeConfig.InactiveTitleColor)
+ InactiveSelTabTitleColor = GetGocuiStyle(themeConfig.InactiveSelTabTitleColor)
  SearchingActiveBorderColor = GetGocuiStyle(themeConfig.SearchingActiveBorderColor)
  SelectedLineBgColor = GetTextStyle(themeConfig.SelectedLineBgColor, true)
 

schema/config.json

@@ -139,6 +139,43 @@
  "default"
  ]
  },
+ "activeTitleColor": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array",
+ "minItems": 1,
+ "uniqueItems": true,
+ "description": "Title color of focused window",
+ "default": [
+ "blue",
+ "bold"
+ ]
+ },
+ "inactiveTitleColor": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array",
+ "minItems": 1,
+ "uniqueItems": true,
+ "description": "Title color of non-focused window",
+ "default": [
+ "default"
+ ]
+ },
+ "inactiveSelTabTitleColor": {
+ "items": {
+ "type": "string"
+ },
+ "type": "array",
+ "minItems": 1,
+ "uniqueItems": true,
+ "description": "Title color of selected tab in non-focused window",
+ "default": [
+ "default"
+ ]
+ },
  "searchingActiveBorderColor": {
  "items": {
  "type": "string"