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

Merge branch 'fixcolorconfig' of github.com:Seanstoppable/wtf into Seanstoppable-fixcolorconfig

Browse Source
This commit is contained in:
Chris Cummer 2019-09-06 03:34:40 -07:00
commit 66ae65cea4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cfg/common_settings.go
View File

@ -62,12 +62,12 @@ func NewCommonSettingsFromModule(name, defaultTitle string, moduleConfig *config
common := Common{ common := Common{
Colors: Colors{ Colors: Colors{
Background: moduleConfig.UString("background", globalSettings.UString("background", "transparent")), Background: moduleConfig.UString("colors.background", colorsConfig.UString("background", "transparent")),
BorderFocusable: colorsConfig.UString("border.focusable", "red"), BorderFocusable: colorsConfig.UString("border.focusable", "red"),
BorderFocused: colorsConfig.UString("border.focused", "orange"), BorderFocused: colorsConfig.UString("border.focused", "orange"),
BorderNormal: colorsConfig.UString("border.normal", "gray"), BorderNormal: colorsConfig.UString("border.normal", "gray"),
Checked: colorsConfig.UString("checked", "white"), Checked: colorsConfig.UString("checked", "white"),
Foreground: moduleConfig.UString("foreground", colorsConfig.UString("foreground", "white")), Foreground: moduleConfig.UString("colors.foreground", colorsConfig.UString("foreground", "white")),
HighlightFore: colorsConfig.UString("highlight.fore", "black"), HighlightFore: colorsConfig.UString("highlight.fore", "black"),
HighlightBack: colorsConfig.UString("highlight.back", "green"), HighlightBack: colorsConfig.UString("highlight.back", "green"),
Text: moduleConfig.UString("colors.text", colorsConfig.UString("text", "white")), Text: moduleConfig.UString("colors.text", colorsConfig.UString("text", "white")),