taigrr/wtf
1
0
Fork 0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00
Code Issues Projects Releases Wiki Activity

Normalize coloring (#620)

Browse Source 
Allow all colors to be configurable on a module level
This commit is contained in:
Sean Smith 2019-09-10 21:22:11 -04:00 committed by GitHub
parent 9b23da07ba
commit bb3c24df73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
cfg/common_settings.go
View File

@ -63,13 +63,13 @@ func NewCommonSettingsFromModule(name, defaultTitle string, moduleConfig *config
common := Common{ common := Common{
Colors: Colors{ Colors: Colors{
Background: moduleConfig.UString("colors.background", colorsConfig.UString("background", "transparent")), Background: moduleConfig.UString("colors.background", colorsConfig.UString("background", "transparent")),
BorderFocusable: colorsConfig.UString("border.focusable", "red"), BorderFocusable: moduleConfig.UString("colors.border.focusable", colorsConfig.UString("border.focusable", "red")),
BorderFocused: colorsConfig.UString("border.focused", "orange"), BorderFocused: moduleConfig.UString("colors.border.focused", colorsConfig.UString("border.focused", "orange")),
BorderNormal: colorsConfig.UString("border.normal", "gray"), BorderNormal: moduleConfig.UString("colors.border.normal", colorsConfig.UString("border.normal", "gray")),
Checked: colorsConfig.UString("checked", "white"), Checked: moduleConfig.UString("colors.checked", colorsConfig.UString("checked", "white")),
Foreground: moduleConfig.UString("colors.foreground", colorsConfig.UString("foreground", "white")), Foreground: moduleConfig.UString("colors.foreground", colorsConfig.UString("foreground", "white")),
HighlightFore: colorsConfig.UString("highlight.fore", "black"), HighlightFore: moduleConfig.UString("colors.highlight.fore", colorsConfig.UString("highlight.fore", "black")),
HighlightBack: colorsConfig.UString("highlight.back", "green"), HighlightBack: moduleConfig.UString("colors.highlight.back", colorsConfig.UString("highlight.back", "green")),
Text: moduleConfig.UString("colors.text", colorsConfig.UString("text", "white")), Text: moduleConfig.UString("colors.text", colorsConfig.UString("text", "white")),
Title: moduleConfig.UString("colors.title", colorsConfig.UString("title", "white")), Title: moduleConfig.UString("colors.title", colorsConfig.UString("title", "white")),
}, },
@ -90,8 +90,8 @@ func NewCommonSettingsFromModule(name, defaultTitle string, moduleConfig *config
focusChar: moduleConfig.UInt("focusChar", -1), focusChar: moduleConfig.UInt("focusChar", -1),
} }
common.Colors.Rows.Even = moduleConfig.UString("colors.rows.even", moduleConfig.UString("rows.even", "white")) common.Colors.Rows.Even = moduleConfig.UString("colors.rows.even", colorsConfig.UString("rows.even", "white"))
common.Colors.Rows.Odd = moduleConfig.UString("colors.rows.even", moduleConfig.UString("rows.odd", "lightblue")) common.Colors.Rows.Odd = moduleConfig.UString("colors.rows.even", colorsConfig.UString("rows.odd", "lightblue"))
common.Sigils.Checkbox.Checked = globalSettings.UString(sigilsPath+".checkbox.checked", "x") common.Sigils.Checkbox.Checked = globalSettings.UString(sigilsPath+".checkbox.checked", "x")
common.Sigils.Checkbox.Unchecked = globalSettings.UString(sigilsPath+".checkbox.unchecked", " ") common.Sigils.Checkbox.Unchecked = globalSettings.UString(sigilsPath+".checkbox.unchecked", " ")